from xterm -> from scoped

README.md

@@ -49,7 +49,7 @@ To start using xterm.js on your browser, add the `xterm.js` and `xterm.css` to t
 The recommended way to load xterm.js is via the ES6 module syntax:
 
 ```javascript
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 ```
 
 ### Addons
@@ -65,7 +65,7 @@ npm i -S xterm-addon-web-links
 Then import the addon, instantiate it and call `Terminal.loadAddon`:
 
 ```ts
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { WebLinksAddon } from 'xterm-addon-web-links';
 
 const terminal = new Terminal();

addons/addon-webgl/src/GlyphRenderer.ts

@@ -8,7 +8,7 @@ import { TextureAtlas } from 'browser/renderer/shared/TextureAtlas';
 import { IRasterizedGlyph, IRenderDimensions, ITextureAtlas } from 'browser/renderer/shared/Types';
 import { NULL_CELL_CODE } from 'common/buffer/Constants';
 import { Disposable, toDisposable } from 'common/Lifecycle';
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject } from './Types';
 import { createProgram, GLTexture, PROJECTION_MATRIX } from './WebglUtils';
 

addons/addon-webgl/src/RectangleRenderer.ts

@@ -10,7 +10,7 @@ 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';
+import { Terminal } from '@xterm/xterm';
 import { RENDER_MODEL_BG_OFFSET, RENDER_MODEL_FG_OFFSET, RENDER_MODEL_INDICIES_PER_CELL } from './RenderModel';
 import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject } from './Types';
 import { createProgram, expandFloat32Array, PROJECTION_MATRIX } from './WebglUtils';

addons/addon-webgl/src/WebglAddon.ts

@@ -9,7 +9,7 @@ import { EventEmitter, forwardEvent } from 'common/EventEmitter';
 import { Disposable, toDisposable } from 'common/Lifecycle';
 import { getSafariVersion, isSafari } from 'common/Platform';
 import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services';
-import { ITerminalAddon, Terminal } from 'xterm';
+import { ITerminalAddon, Terminal } from '@xterm/xterm';
 import { WebglRenderer } from './WebglRenderer';
 import { setTraceLogger } from 'common/services/LogService';
 

addons/addon-webgl/src/WebglRenderer.ts

@@ -19,7 +19,7 @@ import { AttributeData } from 'common/buffer/AttributeData';
 import { CellData } from 'common/buffer/CellData';
 import { Attributes, Content, NULL_CELL_CHAR, NULL_CELL_CODE } from 'common/buffer/Constants';
 import { ICoreService, IDecorationService, IOptionsService } from 'common/services/Services';
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { GlyphRenderer } from './GlyphRenderer';
 import { RectangleRenderer } from './RectangleRenderer';
 import { COMBINED_CHAR_BIT_MASK, RENDER_MODEL_BG_OFFSET, RENDER_MODEL_EXT_OFFSET, RENDER_MODEL_FG_OFFSET, RENDER_MODEL_INDICIES_PER_CELL, RenderModel } from './RenderModel';

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

@@ -12,7 +12,7 @@ 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';
+import { Terminal } from '@xterm/xterm';
 import { IRenderLayer } from './Types';
 
 export abstract class BaseRenderLayer extends Disposable implements IRenderLayer {

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

@@ -9,7 +9,7 @@ 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';
+import { Terminal } from '@xterm/xterm';
 import { BaseRenderLayer } from './BaseRenderLayer';
 
 export class LinkRenderLayer extends BaseRenderLayer {

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

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

addons/addon-webgl/typings/addon-webgl.d.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon, IEvent } from 'xterm';
+import { Terminal, ITerminalAddon, IEvent } from '@xterm/xterm';
 
 declare module '@xterm/addon-webgl' {
   /**

addons/xterm-addon-attach/README.md

@@ -11,7 +11,7 @@ npm install --save xterm-addon-attach
 ### Usage
 
 ```ts
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { AttachAddon } from 'xterm-addon-attach';
 
 const terminal = new Terminal();

addons/xterm-addon-attach/src/AttachAddon.ts

@@ -5,7 +5,7 @@
  * Implements the attach method, that attaches the terminal to a WebSocket stream.
  */
 
-import { Terminal, IDisposable, ITerminalAddon } from 'xterm';
+import { Terminal, IDisposable, ITerminalAddon } from '@xterm/xterm';
 
 interface IAttachOptions {
   bidirectional?: boolean;

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

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon } from 'xterm';
+import { Terminal, ITerminalAddon } from '@xterm/xterm';
 
 declare module 'xterm-addon-attach' {
   export interface IAttachOptions {

addons/xterm-addon-canvas/README.md

@@ -13,7 +13,7 @@ npm install --save xterm-addon-canvas
 ### Usage
 
 ```ts
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { CanvasAddon } from 'xterm-addon-canvas';
 
 const terminal = new Terminal();

addons/xterm-addon-canvas/src/BaseRenderLayer.ts

@@ -19,7 +19,7 @@ import { ICellData } from 'common/Types';
 import { CellData } from 'common/buffer/CellData';
 import { WHITESPACE_CELL_CODE } from 'common/buffer/Constants';
 import { IBufferService, IDecorationService, IOptionsService } from 'common/services/Services';
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { IRenderLayer } from './Types';
 
 export abstract class BaseRenderLayer extends Disposable implements IRenderLayer {

addons/xterm-addon-canvas/src/CanvasAddon.ts

@@ -9,7 +9,7 @@ import { EventEmitter, forwardEvent } from 'common/EventEmitter';
 import { Disposable, toDisposable } from 'common/Lifecycle';
 import { setTraceLogger } from 'common/services/LogService';
 import { IBufferService, IDecorationService, ILogService } from 'common/services/Services';
-import { ITerminalAddon, Terminal } from 'xterm';
+import { ITerminalAddon, Terminal } from '@xterm/xterm';
 import { CanvasRenderer } from './CanvasRenderer';
 
 export class CanvasAddon extends Disposable implements ITerminalAddon {

addons/xterm-addon-canvas/src/CanvasRenderer.ts

@@ -12,7 +12,7 @@ import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeS
 import { EventEmitter, forwardEvent } from 'common/EventEmitter';
 import { Disposable, toDisposable } from 'common/Lifecycle';
 import { IBufferService, ICoreService, IDecorationService, IOptionsService } from 'common/services/Services';
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { CursorRenderLayer } from './CursorRenderLayer';
 import { LinkRenderLayer } from './LinkRenderLayer';
 import { SelectionRenderLayer } from './SelectionRenderLayer';

addons/xterm-addon-canvas/src/CursorRenderLayer.ts

@@ -12,7 +12,7 @@ import { isFirefox } from 'common/Platform';
 import { ICellData } from 'common/Types';
 import { CellData } from 'common/buffer/CellData';
 import { IBufferService, ICoreService, IDecorationService, IOptionsService } from 'common/services/Services';
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { BaseRenderLayer } from './BaseRenderLayer';
 
 interface ICursorState {

addons/xterm-addon-canvas/src/LinkRenderLayer.ts

@@ -9,7 +9,7 @@ import { INVERTED_DEFAULT_COLOR } from 'browser/renderer/shared/Constants';
 import { IRenderDimensions } from 'browser/renderer/shared/Types';
 import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
 import { IBufferService, IDecorationService, IOptionsService } from 'common/services/Services';
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { BaseRenderLayer } from './BaseRenderLayer';
 
 export class LinkRenderLayer extends BaseRenderLayer {

addons/xterm-addon-canvas/src/SelectionRenderLayer.ts

@@ -7,7 +7,7 @@ import { IRenderDimensions } from 'browser/renderer/shared/Types';
 import { BaseRenderLayer } from './BaseRenderLayer';
 import { IBufferService, IDecorationService, IOptionsService } from 'common/services/Services';
 import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 
 interface ISelectionState {
   start?: [number, number];

addons/xterm-addon-canvas/src/TextRenderLayer.ts

@@ -11,7 +11,7 @@ import { AttributeData } from 'common/buffer/AttributeData';
 import { CellData } from 'common/buffer/CellData';
 import { Content, NULL_CELL_CODE } from 'common/buffer/Constants';
 import { IBufferService, IDecorationService, IOptionsService } from 'common/services/Services';
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { BaseRenderLayer } from './BaseRenderLayer';
 import { GridCache } from './GridCache';
 

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

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon, IEvent } from 'xterm';
+import { Terminal, ITerminalAddon, IEvent } from '@xterm/xterm';
 
 declare module 'xterm-addon-canvas' {
   /**

addons/xterm-addon-fit/README.md

@@ -11,7 +11,7 @@ npm install --save xterm-addon-fit
 ### Usage
 
 ```ts
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { FitAddon } from 'xterm-addon-fit';
 
 const terminal = new Terminal();

addons/xterm-addon-fit/src/FitAddon.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon } from 'xterm';
+import { Terminal, ITerminalAddon } from '@xterm/xterm';
 import { IRenderDimensions } from 'browser/renderer/shared/Types';
 
 interface ITerminalDimensions {

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

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon } from 'xterm';
+import { Terminal, ITerminalAddon } from '@xterm/xterm';
 
 declare module 'xterm-addon-fit' {
   /**

addons/xterm-addon-image/README.md

@@ -16,7 +16,7 @@ npm install --save xterm-addon-image
 ### Usage
 
 ```ts
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { ImageAddon, IImageAddonOptions } from 'xterm-addon-image';
 
 // customize as needed (showing addon defaults)

addons/xterm-addon-image/src/ImageAddon.ts

@@ -4,7 +4,7 @@
  */
 
 import { IIPHandler } from './IIPHandler';
-import { ITerminalAddon, IDisposable } from 'xterm';
+import { ITerminalAddon, IDisposable } from '@xterm/xterm';
 import { ImageRenderer } from './ImageRenderer';
 import { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';
 import { SixelHandler } from './SixelHandler';

addons/xterm-addon-image/src/ImageRenderer.ts

@@ -4,7 +4,7 @@
  */
 
 import { toRGBA8888 } from 'sixel/lib/Colors';
-import { IDisposable } from 'xterm';
+import { IDisposable } from '@xterm/xterm';
 import { ICellSize, ITerminalExt, IImageSpec, IRenderDimensions, IRenderService } from './Types';
 import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
 

addons/xterm-addon-image/src/ImageStorage.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IDisposable } from 'xterm';
+import { IDisposable } from '@xterm/xterm';
 import { ImageRenderer } from './ImageRenderer';
 import { ITerminalExt, IExtendedAttrsImage, IImageAddonOptions, IImageSpec, IBufferLineExt, BgFlags, Cell, Content, ICellSize, ExtFlags, Attributes, UnderlineStyle } from './Types';
 

addons/xterm-addon-image/src/Types.d.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IDisposable, IMarker, Terminal } from 'xterm';
+import { IDisposable, IMarker, Terminal } from '@xterm/xterm';
 
 // private imports from base repo we build against
 import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from 'common/buffer/Constants';

addons/xterm-addon-image/typings/xterm-addon-image.d.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon } from 'xterm';
+import { Terminal, ITerminalAddon } from '@xterm/xterm';
 
 declare module 'xterm-addon-image' {
   export interface IImageAddonOptions {
@@ -37,7 +37,7 @@ declare module 'xterm-addon-image' {
      *
      * Note: `storageLimit` bytes are calculated from images by multiplying the pixels with 4
      * (4 channels with one byte, images are stored as RGBA8888).
-     * 
+     *
      * Default is 2^16 (4096 x 4096 pixels).
      */
     pixelLimit?: number;

addons/xterm-addon-ligatures/README.md

@@ -16,7 +16,7 @@ npm install --save xterm-addon-ligatures
 ### Usage
 
 ```ts
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { LigaturesAddon } from 'xterm-addon-ligatures';
 
 const terminal = new Terminal();

addons/xterm-addon-ligatures/src/LigaturesAddon.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { enableLigatures } from '.';
 import { ILigatureOptions } from './Types';
 

addons/xterm-addon-ligatures/src/index.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import type { Terminal } from 'xterm';
+import type { Terminal } from '@xterm/xterm';
 import { Font } from 'font-ligatures';
 
 import load from './font';

addons/xterm-addon-ligatures/typings/xterm-addon-ligatures.d.ts

@@ -8,7 +8,7 @@
  * which is intended to be stable and consumed by external programs.
  */
 
-import { Terminal, ITerminalAddon } from 'xterm';
+import { Terminal, ITerminalAddon } from '@xterm/xterm';
 
 declare module 'xterm-addon-ligatures' {
   /**

addons/xterm-addon-search/README.md

@@ -11,7 +11,7 @@ npm install --save xterm-addon-search
 ### Usage
 
 ```ts
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { SearchAddon } from 'xterm-addon-search';
 
 const terminal = new Terminal();

addons/xterm-addon-search/src/SearchAddon.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, IDisposable, ITerminalAddon, IDecoration } from 'xterm';
+import { Terminal, IDisposable, ITerminalAddon, IDecoration } from '@xterm/xterm';
 import { EventEmitter } from 'common/EventEmitter';
 import { Disposable, toDisposable, disposeArray, MutableDisposable } from 'common/Lifecycle';
 

addons/xterm-addon-search/typings/xterm-addon-search.d.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon, IEvent } from 'xterm';
+import { Terminal, ITerminalAddon, IEvent } from '@xterm/xterm';
 
 declare module 'xterm-addon-search' {
   /**

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

@@ -7,7 +7,7 @@
 
 import { DEFAULT_ANSI_COLORS } from 'browser/services/ThemeService';
 import { IAttributeData, IColor } from 'common/Types';
-import { IBuffer, IBufferCell, IBufferRange, ITerminalAddon, Terminal } from 'xterm';
+import { IBuffer, IBufferCell, IBufferRange, ITerminalAddon, Terminal } from '@xterm/xterm';
 
 function constrain(value: number, low: number, high: number): number {
   return Math.max(low, Math.min(value, high));

addons/xterm-addon-serialize/typings/xterm-addon-serialize.d.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon } from 'xterm';
+import { Terminal, ITerminalAddon } from '@xterm/xterm';
 
 declare module 'xterm-addon-serialize' {
   /**

addons/xterm-addon-unicode-graphemes/README.md

@@ -13,7 +13,7 @@ This addon is not yet published to npm
 ### Usage
 
 ```ts
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { UnicodeGraphemesAddon } from 'xterm-addon-unicode-graphemes';
 
 const terminal = new Terminal();

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

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IUnicodeVersionProvider } from 'xterm';
+import { IUnicodeVersionProvider } from '@xterm/xterm';
 import { UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services';
 import { UnicodeService } from 'common/services/UnicodeService';
 import * as UC from './third-party/UnicodeProperties';

addons/xterm-addon-unicode-graphemes/src/UnicodeGraphemesAddon.ts

@@ -5,7 +5,7 @@
  * UnicodeVersionProvider for V15 with grapeme cluster handleing.
  */
 
-import { Terminal, ITerminalAddon, IUnicodeHandling } from 'xterm';
+import { Terminal, ITerminalAddon, IUnicodeHandling } from '@xterm/xterm';
 import { UnicodeGraphemeProvider } from './UnicodeGraphemeProvider';
 
 

addons/xterm-addon-unicode-graphemes/typings/xterm-addon-unicode-graphemes.d.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon } from 'xterm';
+import { Terminal, ITerminalAddon } from '@xterm/xterm';
 
 declare module 'xterm-addon-unicode-graphemes' {
   export class UnicodeGraphemesAddon implements ITerminalAddon {

addons/xterm-addon-unicode11/README.md

@@ -11,7 +11,7 @@ npm install --save xterm-addon-unicode11
 ### Usage
 
 ```ts
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { Unicode11Addon } from 'xterm-addon-unicode11';
 
 const terminal = new Terminal();

addons/xterm-addon-unicode11/src/Unicode11Addon.ts

@@ -5,7 +5,7 @@
  * UnicodeVersionProvider for V11.
  */
 
-import { Terminal, ITerminalAddon } from 'xterm';
+import { Terminal, ITerminalAddon } from '@xterm/xterm';
 import { UnicodeV11 } from './UnicodeV11';
 
 

addons/xterm-addon-unicode11/src/UnicodeV11.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IUnicodeVersionProvider } from 'xterm';
+import { IUnicodeVersionProvider } from '@xterm/xterm';
 import { UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services';
 import { UnicodeService } from 'common/services/UnicodeService';
 

addons/xterm-addon-unicode11/typings/xterm-addon-unicode11.d.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon } from 'xterm';
+import { Terminal, ITerminalAddon } from '@xterm/xterm';
 
 declare module 'xterm-addon-unicode11' {
   export class Unicode11Addon implements ITerminalAddon {

addons/xterm-addon-web-links/README.md

@@ -11,7 +11,7 @@ npm install --save xterm-addon-web-links
 ### Usage
 
 ```ts
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 import { WebLinksAddon } from 'xterm-addon-web-links';
 
 const terminal = new Terminal();

addons/xterm-addon-web-links/src/WebLinkProvider.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { ILinkProvider, ILink, Terminal, IViewportRange, IBufferLine } from 'xterm';
+import { ILinkProvider, ILink, Terminal, IViewportRange, IBufferLine } from '@xterm/xterm';
 
 export interface ILinkProviderOptions {
   hover?(event: MouseEvent, text: string, location: IViewportRange): void;

addons/xterm-addon-web-links/src/WebLinksAddon.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon, IDisposable } from 'xterm';
+import { Terminal, ITerminalAddon, IDisposable } from '@xterm/xterm';
 import { ILinkProviderOptions, WebLinkProvider } from './WebLinkProvider';
 
 // consider everthing starting with http:// or https://

addons/xterm-addon-web-links/typings/xterm-addon-web-links.d.ts

@@ -4,7 +4,7 @@
  */
 
 
-import { Terminal, ITerminalAddon, IViewportRange } from 'xterm';
+import { Terminal, ITerminalAddon, IViewportRange } from '@xterm/xterm';
 
 declare module 'xterm-addon-web-links' {
   /**

demo/client.ts

@@ -44,7 +44,7 @@ if ('WebAssembly' in window) {
 
 // Pulling in the module's types relies on the <reference> above, it's looks a
 // little weird here as we're importing "this" module
-import { Terminal as TerminalType, ITerminalOptions } from 'xterm';
+import { Terminal as TerminalType, ITerminalOptions } from '@xterm/xterm';
 
 export interface IWindowWithTerminal extends Window {
   term: TerminalType;

src/browser/Terminal.ts

@@ -54,7 +54,7 @@ import { evaluateKeyboardEvent } from 'common/input/Keyboard';
 import { toRgbString } from 'common/input/XParseColor';
 import { DecorationService } from 'common/services/DecorationService';
 import { IDecorationService } from 'common/services/Services';
-import { IDecoration, IDecorationOptions, IDisposable, ILinkProvider, IMarker } from 'xterm';
+import { IDecoration, IDecorationOptions, IDisposable, ILinkProvider, IMarker } from '@xterm/xterm';
 import { WindowsOptionsReportType } from '../common/InputHandler';
 import { AccessibilityManager } from './AccessibilityManager';
 

src/browser/Terminal2.test.ts

@@ -9,7 +9,7 @@ import * as os from 'os';
 import * as fs from 'fs';
 import * as pty from 'node-pty';
 import { Terminal } from 'browser/Terminal';
-import { IDisposable } from 'xterm';
+import { IDisposable } from '@xterm/xterm';
 
 // all test files expect terminal in 80x25
 const COLS = 80;

src/browser/TestUtils.test.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IDisposable, IMarker, ILinkProvider, IDecorationOptions, IDecoration } from 'xterm';
+import { IDisposable, IMarker, ILinkProvider, IDecorationOptions, IDecoration } from '@xterm/xterm';
 import { IEvent, EventEmitter } from 'common/EventEmitter';
 import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IMouseService, IRenderService, ISelectionService, IThemeService } from 'browser/services/Services';
 import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'browser/renderer/shared/Types';

src/browser/Types.d.ts

@@ -6,7 +6,7 @@
 import { IEvent } from 'common/EventEmitter';
 import { CharData, IColor, ICoreTerminal, ITerminalOptions } from 'common/Types';
 import { IBuffer } from 'common/buffer/Types';
-import { IDisposable, Terminal as ITerminalApi } from 'xterm';
+import { IDisposable, Terminal as ITerminalApi } from '@xterm/xterm';
 import { IMouseService, IRenderService } from './services/Services';
 
 /**

src/browser/public/Terminal.ts

@@ -13,7 +13,7 @@ import { AddonManager } from 'common/public/AddonManager';
 import { BufferNamespaceApi } from 'common/public/BufferNamespaceApi';
 import { ParserApi } from 'common/public/ParserApi';
 import { UnicodeApi } from 'common/public/UnicodeApi';
-import { IBufferNamespace as IBufferNamespaceApi, IDecoration, IDecorationOptions, IDisposable, ILinkProvider, ILocalizableStrings, IMarker, IModes, IParser, ITerminalAddon, Terminal as ITerminalApi, ITerminalInitOnlyOptions, IUnicodeHandling } from 'xterm';
+import { IBufferNamespace as IBufferNamespaceApi, IDecoration, IDecorationOptions, IDisposable, ILinkProvider, ILocalizableStrings, IMarker, IModes, IParser, ITerminalAddon, Terminal as ITerminalApi, ITerminalInitOnlyOptions, IUnicodeHandling } from '@xterm/xterm';
 
 /**
  * The set of options that only have an effect when set in the Terminal constructor.

src/browser/renderer/shared/CellColorResolver.ts

@@ -4,7 +4,7 @@ import { ReadonlyColorSet } from 'browser/Types';
 import { Attributes, BgFlags, FgFlags } from 'common/buffer/Constants';
 import { IDecorationService } from 'common/services/Services';
 import { ICellData } from 'common/Types';
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 
 // Work variables to avoid garbage collection
 let $fg = 0;

src/browser/renderer/shared/CharAtlasCache.ts

@@ -4,7 +4,7 @@
  */
 
 import { TextureAtlas } from 'browser/renderer/shared/TextureAtlas';
-import { ITerminalOptions, Terminal } from 'xterm';
+import { ITerminalOptions, Terminal } from '@xterm/xterm';
 import { ITerminal, ReadonlyColorSet } from 'browser/Types';
 import { ICharAtlasConfig, ITextureAtlas } from 'browser/renderer/shared/Types';
 import { generateConfig, configEquals } from 'browser/renderer/shared/CharAtlasUtils';

src/browser/renderer/shared/CharAtlasUtils.ts

@@ -5,7 +5,7 @@
 
 import { ICharAtlasConfig } from './Types';
 import { Attributes } from 'common/buffer/Constants';
-import { ITerminalOptions } from 'xterm';
+import { ITerminalOptions } from '@xterm/xterm';
 import { IColorSet, ReadonlyColorSet } from 'browser/Types';
 import { NULL_COLOR } from 'common/Color';
 

src/browser/renderer/shared/SelectionRenderModel.ts

@@ -4,7 +4,7 @@
  */
 
 import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
-import { Terminal } from 'xterm';
+import { Terminal } from '@xterm/xterm';
 
 class SelectionRenderModel implements ISelectionRenderModel {
   public hasSelection!: boolean;

src/browser/renderer/shared/Types.d.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { FontWeight, Terminal } from 'xterm';
+import { FontWeight, Terminal } from '@xterm/xterm';
 import { IColorSet } from 'browser/Types';
 import { IDisposable } from 'common/Types';
 import { IEvent } from 'common/EventEmitter';

src/common/TestUtils.test.ts

@@ -12,7 +12,7 @@ import { IBufferSet, IBuffer } from 'common/buffer/Types';
 import { BufferSet } from 'common/buffer/BufferSet';
 import { IDecPrivateModes, ICoreMouseEvent, CoreMouseEventType, ICharset, IModes, IAttributeData, IOscLinkData, IDisposable } from 'common/Types';
 import { UnicodeV6 } from 'common/input/UnicodeV6';
-import { IDecorationOptions, IDecoration } from 'xterm';
+import { IDecorationOptions, IDecoration } from '@xterm/xterm';
 
 export class MockBufferService implements IBufferService {
   public serviceBrand: any;

src/common/Types.d.ts

@@ -9,7 +9,7 @@ import { Attributes, UnderlineStyle } from 'common/buffer/Constants'; // eslint-
 import { IBufferSet } from 'common/buffer/Types';
 import { IParams } from 'common/parser/Types';
 import { ICoreMouseService, ICoreService, IOptionsService, IUnicodeService } from 'common/services/Services';
-import { IFunctionIdentifier, ITerminalOptions as IPublicTerminalOptions } from 'xterm';
+import { IFunctionIdentifier, ITerminalOptions as IPublicTerminalOptions } from '@xterm/xterm';
 
 export interface ICoreTerminal {
   coreMouseService: ICoreMouseService;

src/common/buffer/BufferRange.test.ts

@@ -5,7 +5,7 @@
 
 import { assert } from 'chai';
 import { getRangeLength } from 'common/buffer/BufferRange';
-import { IBufferRange } from 'xterm';
+import { IBufferRange } from '@xterm/xterm';
 
 describe('BufferRange', () => {
   describe('getRangeLength', () => {

src/common/buffer/BufferRange.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IBufferRange } from 'xterm';
+import { IBufferRange } from '@xterm/xterm';
 
 export function getRangeLength(range: IBufferRange, bufferCols: number): number {
   if (range.start.y > range.end.y) {

src/common/public/AddonManager.test.ts

@@ -5,7 +5,7 @@
 
 import { assert } from 'chai';
 import { AddonManager, ILoadedAddon } from './AddonManager';
-import { ITerminalAddon } from 'xterm';
+import { ITerminalAddon } from '@xterm/xterm';
 
 class TestAddonManager extends AddonManager {
   public get addons(): ILoadedAddon[] {

src/common/public/AddonManager.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { ITerminalAddon, IDisposable, Terminal } from 'xterm';
+import { ITerminalAddon, IDisposable, Terminal } from '@xterm/xterm';
 
 export interface ILoadedAddon {
   instance: ITerminalAddon;

src/common/public/BufferApiView.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IBuffer as IBufferApi, IBufferLine as IBufferLineApi, IBufferCell as IBufferCellApi } from 'xterm';
+import { IBuffer as IBufferApi, IBufferLine as IBufferLineApi, IBufferCell as IBufferCellApi } from '@xterm/xterm';
 import { IBuffer } from 'common/buffer/Types';
 import { BufferLineApiView } from 'common/public/BufferLineApiView';
 import { CellData } from 'common/buffer/CellData';

src/common/public/BufferLineApiView.ts

@@ -5,7 +5,7 @@
 
 import { CellData } from 'common/buffer/CellData';
 import { IBufferLine, ICellData } from 'common/Types';
-import { IBufferCell as IBufferCellApi, IBufferLine as IBufferLineApi } from 'xterm';
+import { IBufferCell as IBufferCellApi, IBufferLine as IBufferLineApi } from '@xterm/xterm';
 
 export class BufferLineApiView implements IBufferLineApi {
   constructor(private _line: IBufferLine) { }

src/common/public/BufferNamespaceApi.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IBuffer as IBufferApi, IBufferNamespace as IBufferNamespaceApi } from 'xterm';
+import { IBuffer as IBufferApi, IBufferNamespace as IBufferNamespaceApi } from '@xterm/xterm';
 import { BufferApiView } from 'common/public/BufferApiView';
 import { EventEmitter } from 'common/EventEmitter';
 import { ICoreTerminal } from 'common/Types';

src/common/public/ParserApi.ts

@@ -4,7 +4,7 @@
  */
 
 import { IParams } from 'common/parser/Types';
-import { IDisposable, IFunctionIdentifier, IParser } from 'xterm';
+import { IDisposable, IFunctionIdentifier, IParser } from '@xterm/xterm';
 import { ICoreTerminal } from 'common/Types';
 
 export class ParserApi implements IParser {

src/common/public/UnicodeApi.ts

@@ -4,7 +4,7 @@
  */
 
 import { ICoreTerminal } from 'common/Types';
-import { IUnicodeHandling, IUnicodeVersionProvider } from 'xterm';
+import { IUnicodeHandling, IUnicodeVersionProvider } from '@xterm/xterm';
 
 export class UnicodeApi implements IUnicodeHandling {
   constructor(private _core: ICoreTerminal) { }

src/common/services/DecorationService.ts

@@ -9,7 +9,7 @@ import { Disposable, toDisposable } from 'common/Lifecycle';
 import { IDecorationService, IInternalDecoration } from 'common/services/Services';
 import { SortedList } from 'common/SortedList';
 import { IColor } from 'common/Types';
-import { IDecoration, IDecorationOptions, IMarker } from 'xterm';
+import { IDecoration, IDecorationOptions, IMarker } from '@xterm/xterm';
 
 // Work variables to avoid garbage collection
 let $xmin = 0;

src/common/services/Services.ts

@@ -7,7 +7,7 @@ import { IEvent, IEventEmitter } from 'common/EventEmitter';
 import { IBuffer, IBufferSet } from 'common/buffer/Types';
 import { IDecPrivateModes, ICoreMouseEvent, CoreMouseEncoding, ICoreMouseProtocol, CoreMouseEventType, ICharset, IWindowOptions, IModes, IAttributeData, ScrollSource, IDisposable, IColor, CursorStyle, CursorInactiveStyle, IOscLinkData } from 'common/Types';
 import { createDecorator } from 'common/services/ServiceRegistry';
-import { IDecorationOptions, IDecoration, ILinkHandler, IWindowsPty, ILogger } from 'xterm';
+import { IDecorationOptions, IDecoration, ILinkHandler, IWindowsPty, ILogger } from '@xterm/xterm';
 
 export const IBufferService = createDecorator<IBufferService>('BufferService');
 export interface IBufferService {

src/headless/tsconfig.json

@@ -17,7 +17,7 @@
   },
   "include": [
     "./**/*",
-    "../../typings/xterm.d.ts", // common/Types.d.ts imports from 'xterm'
+    "../../typings/xterm.d.ts", // common/Types.d.ts imports from '@xterm/xterm'
     "../../typings/xterm-headless.d.ts"
   ],
   "references": [

test/api/TestUtils.ts

@@ -5,7 +5,7 @@
 
 import * as playwright from '@playwright/test';
 import deepEqual = require('deep-equal');
-import { ITerminalInitOnlyOptions, ITerminalOptions } from 'xterm';
+import { ITerminalInitOnlyOptions, ITerminalOptions } from '@xterm/xterm';
 import { deepStrictEqual } from 'assert';
 
 export async function pollFor<T>(page: playwright.Page, evalOrFn: string | (() => Promise<T>), val: T, preFn?: () => Promise<void>, maxDuration?: number): Promise<void> {

test/playwright/MouseTracking.test.ts

@@ -4,7 +4,7 @@
  */
 import { test } from '@playwright/test';
 import { deepStrictEqual, ok, strictEqual } from 'assert';
-import type { IDisposable } from 'xterm';
+import type { IDisposable } from '@xterm/xterm';
 import { createTestContext, ITestContext, openTerminal, pollFor } from './TestUtils';
 
 let ctx: ITestContext;

test/playwright/Parser.test.ts

@@ -4,7 +4,7 @@
  */
 import { test } from '@playwright/test';
 import { deepStrictEqual, ok, strictEqual } from 'assert';
-import type { IDisposable } from 'xterm';
+import type { IDisposable } from '@xterm/xterm';
 import { createTestContext, ITestContext, openTerminal, pollFor } from './TestUtils';
 
 let ctx: ITestContext;

test/playwright/SharedRendererTests.ts

@@ -5,7 +5,7 @@
 
 import { IImage32, decodePng } from '@lunapaint/png-codec';
 import { LocatorScreenshotOptions, test } from '@playwright/test';
-import { ITheme } from 'xterm';
+import { ITheme } from '@xterm/xterm';
 import { ITestContext, MaybeAsync, openTerminal, pollFor, pollForApproximate } from './TestUtils';
 
 export interface ISharedRendererTestContext {

test/playwright/TestUtils.ts

@@ -10,7 +10,7 @@ import type { IRenderService } from 'browser/services/Services';
 import type { ICoreTerminal, IMarker } from 'common/Types';
 import * as playwright from '@playwright/test';
 import { PageFunction } from 'playwright-core/types/structs';
-import { IBuffer, IBufferCell, IBufferLine, IBufferNamespace, IBufferRange, IDecoration, IDecorationOptions, IModes, ITerminalInitOnlyOptions, ITerminalOptions, Terminal } from 'xterm';
+import { IBuffer, IBufferCell, IBufferLine, IBufferNamespace, IBufferRange, IDecoration, IDecorationOptions, IModes, ITerminalInitOnlyOptions, ITerminalOptions, Terminal } from '@xterm/xterm';
 import { EventEmitter } from '../../out/common/EventEmitter';
 
 export interface ITestContext {