Rename ui to browser

demo/start.js

@@ -51,8 +51,7 @@ const clientConfig = {
     extensions: [ '.tsx', '.ts', '.js' ],
     alias: {
       common: path.resolve('./out/common'),
-      core: path.resolve('./out/core'),
-      ui: path.resolve('./out/ui')
+      browser: path.resolve('./out/browser')
     }
   },
   output: {

src/AccessibilityManager.ts

@@ -6,10 +6,10 @@
 import * as Strings from './Strings';
 import { ITerminal, IBuffer } from './Types';
 import { isMac } from 'common/Platform';
-import { RenderDebouncer } from 'ui/RenderDebouncer';
-import { addDisposableDomListener } from 'ui/Lifecycle';
+import { RenderDebouncer } from 'browser/RenderDebouncer';
+import { addDisposableDomListener } from 'browser/Lifecycle';
 import { Disposable } from 'common/Lifecycle';
-import { ScreenDprMonitor } from 'ui/ScreenDprMonitor';
+import { ScreenDprMonitor } from 'browser/ScreenDprMonitor';
 import { IRenderDimensions } from './renderer/Types';
 
 const MAX_ROWS_TO_READ = 20;

src/CompositionHelper.ts

@@ -4,7 +4,7 @@
  */
 
 import { ITerminal } from './Types';
-import { ICharSizeService } from 'ui/services/Services';
+import { ICharSizeService } from 'browser/services/Services';
 
 interface IPosition {
   start: number;

src/MouseHelper.ts

@@ -5,7 +5,7 @@
 
 import { IMouseHelper } from './Types';
 import { RenderCoordinator } from './renderer/RenderCoordinator';
-import { ICharSizeService } from 'ui/services/Services';
+import { ICharSizeService } from 'browser/services/Services';
 
 export class MouseHelper implements IMouseHelper {
   constructor(

src/MouseZoneManager.ts

@@ -5,7 +5,7 @@
 
 import { ITerminal, IMouseZoneManager, IMouseZone } from './Types';
 import { Disposable } from 'common/Lifecycle';
-import { addDisposableDomListener } from 'ui/Lifecycle';
+import { addDisposableDomListener } from 'browser/Lifecycle';
 
 const HOVER_DURATION = 500;
 

src/SelectionManager.ts

@@ -12,7 +12,7 @@ import { AltClickHandler } from './handlers/AltClickHandler';
 import { CellData } from 'common/buffer/BufferLine';
 import { IDisposable } from 'xterm';
 import { EventEmitter2, IEvent } from 'common/EventEmitter2';
-import { ICharSizeService } from 'ui/services/Services';
+import { ICharSizeService } from 'browser/services/Services';
 
 /**
  * The number of pixels the mouse needs to be above or below the viewport in

src/Terminal.ts

@@ -35,7 +35,7 @@ import { Renderer } from './renderer/Renderer';
 import { Linkifier } from './Linkifier';
 import { SelectionManager } from './SelectionManager';
 import * as Browser from 'common/Platform';
-import { addDisposableDomListener } from 'ui/Lifecycle';
+import { addDisposableDomListener } from 'browser/Lifecycle';
 import * as Strings from './Strings';
 import { MouseHelper } from './MouseHelper';
 import { SoundManager } from './SoundManager';
@@ -49,12 +49,12 @@ import { evaluateKeyboardEvent } from 'common/input/Keyboard';
 import { EventEmitter2, IEvent } from 'common/EventEmitter2';
 import { Attributes, DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
 import { applyWindowsMode } from './WindowsMode';
-import { ColorManager } from 'ui/ColorManager';
+import { ColorManager } from 'browser/ColorManager';
 import { RenderCoordinator } from './renderer/RenderCoordinator';
 import { IOptionsService } from 'common/services/Services';
 import { OptionsService } from 'common/services/OptionsService';
-import { ICharSizeService } from 'ui/services/Services';
-import { CharSizeService } from 'ui/services/CharSizeService';
+import { ICharSizeService } from 'browser/services/Services';
+import { CharSizeService } from 'browser/services/CharSizeService';
 
 // Let it work inside Node.js for automated testing purposes.
 const document = (typeof window !== 'undefined') ? window.document : null;

src/TestUtils.test.ts

@@ -11,9 +11,9 @@ import * as Browser from 'common/Platform';
 import { IDisposable, IMarker, IEvent, ISelectionPosition } from 'xterm';
 import { Terminal } from './Terminal';
 import { AttributeData } from 'common/buffer/BufferLine';
-import { IColorManager, IColorSet } from 'ui/Types';
+import { IColorManager, IColorSet } from 'browser/Types';
 import { IOptionsService } from 'common/services/Services';
-import { ICharSizeService } from 'ui/services/Services';
+import { ICharSizeService } from 'browser/services/Services';
 
 export class TestTerminal extends Terminal {
   writeSync(data: string): void {

src/Types.ts

@@ -6,7 +6,7 @@
 import { ITerminalOptions as IPublicTerminalOptions, IEventEmitter, IDisposable, IMarker, ISelectionPosition } from 'xterm';
 import { ICharset, IAttributeData, ICellData, IBufferLine, CharData, ICircularList } from 'common/Types';
 import { IEvent } from 'common/EventEmitter2';
-import { IColorSet } from 'ui/Types';
+import { IColorSet } from 'browser/Types';
 import { IOptionsService } from 'common/services/Services';
 
 export type CustomKeyEventHandler = (event: KeyboardEvent) => boolean;

src/Viewport.ts

@@ -5,10 +5,10 @@
 
 import { ITerminal, IViewport } from './Types';
 import { Disposable } from 'common/Lifecycle';
-import { addDisposableDomListener } from 'ui/Lifecycle';
-import { IColorSet } from 'ui/Types';
+import { addDisposableDomListener } from 'browser/Lifecycle';
+import { IColorSet } from 'browser/Types';
 import { IRenderDimensions } from './renderer/Types';
-import { ICharSizeService } from 'ui/services/Services';
+import { ICharSizeService } from 'browser/services/Services';
 
 const FALLBACK_SCROLL_BAR_WIDTH = 15;
 

src/browser/ColorManager.test.ts

@@ -5,7 +5,7 @@
 
 import jsdom = require('jsdom');
 import { assert } from 'chai';
-import { ColorManager } from 'ui/ColorManager';
+import { ColorManager } from 'browser/ColorManager';
 
 describe('ColorManager', () => {
   let cm: ColorManager;

src/browser/ColorManager.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IColorManager, IColor, IColorSet, ITheme } from 'ui/Types';
+import { IColorManager, IColor, IColorSet, ITheme } from 'browser/Types';
 
 const DEFAULT_FOREGROUND = fromHex('#ffffff');
 const DEFAULT_BACKGROUND = fromHex('#000000');

src/browser/services/CharSizeService.ts

@@ -5,7 +5,7 @@
 
 import { IOptionsService } from 'common/services/Services';
 import { IEvent, EventEmitter2 } from 'common/EventEmitter2';
-import { ICharSizeService } from 'ui/services/Services';
+import { ICharSizeService } from 'browser/services/Services';
 
 export class CharSizeService implements ICharSizeService {
   public width: number = 0;

src/renderer/BaseRenderLayer.ts

@@ -10,7 +10,7 @@ import { DIM_OPACITY, INVERTED_DEFAULT_COLOR, IGlyphIdentifier } from './atlas/T
 import { BaseCharAtlas } from './atlas/BaseCharAtlas';
 import { acquireCharAtlas } from './atlas/CharAtlasCache';
 import { CellData, AttributeData, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE } from 'common/buffer/BufferLine';
-import { IColorSet } from 'ui/Types';
+import { IColorSet } from 'browser/Types';
 
 export abstract class BaseRenderLayer implements IRenderLayer {
   private _canvas: HTMLCanvasElement;

src/renderer/CursorRenderLayer.ts

@@ -8,7 +8,7 @@ import { BaseRenderLayer } from './BaseRenderLayer';
 import { ITerminal } from '../Types';
 import { ICellData } from 'common/Types';
 import { CellData } from 'common/buffer/BufferLine';
-import { IColorSet } from 'ui/Types';
+import { IColorSet } from 'browser/Types';
 
 interface ICursorState {
   x: number;

src/renderer/LinkRenderLayer.ts

@@ -8,7 +8,7 @@ import { IRenderDimensions } from './Types';
 import { BaseRenderLayer } from './BaseRenderLayer';
 import { INVERTED_DEFAULT_COLOR } from './atlas/Types';
 import { is256Color } from './atlas/CharAtlasUtils';
-import { IColorSet } from 'ui/Types';
+import { IColorSet } from 'browser/Types';
 
 export class LinkRenderLayer extends BaseRenderLayer {
   private _state: ILinkifierEvent = null;

src/renderer/RenderCoordinator.ts

@@ -4,15 +4,15 @@
  */
 
 import { IRenderer, IRenderDimensions } from './Types';
-import { RenderDebouncer } from 'ui/RenderDebouncer';
+import { RenderDebouncer } from 'browser/RenderDebouncer';
 import { EventEmitter2, IEvent } from 'common/EventEmitter2';
 import { Disposable } from 'common/Lifecycle';
-import { ScreenDprMonitor } from 'ui/ScreenDprMonitor';
-import { addDisposableDomListener } from 'ui/Lifecycle';
-import { IColorSet } from 'ui/Types';
+import { ScreenDprMonitor } from 'browser/ScreenDprMonitor';
+import { addDisposableDomListener } from 'browser/Lifecycle';
+import { IColorSet } from 'browser/Types';
 import { CharacterJoinerHandler } from '../Types';
 import { IOptionsService } from 'common/services/Services';
-import { ICharSizeService } from 'ui/services/Services';
+import { ICharSizeService } from 'browser/services/Services';
 
 export class RenderCoordinator extends Disposable {
   private _renderDebouncer: RenderDebouncer;

src/renderer/Renderer.ts

@@ -11,8 +11,8 @@ import { ITerminal, CharacterJoinerHandler } from '../Types';
 import { LinkRenderLayer } from './LinkRenderLayer';
 import { CharacterJoinerRegistry } from '../renderer/CharacterJoinerRegistry';
 import { Disposable } from 'common/Lifecycle';
-import { IColorSet } from 'ui/Types';
-import { ICharSizeService } from 'ui/services/Services';
+import { IColorSet } from 'browser/Types';
+import { ICharSizeService } from 'browser/services/Services';
 
 export class Renderer extends Disposable implements IRenderer {
   private _renderLayers: IRenderLayer[];

src/renderer/SelectionRenderLayer.ts

@@ -6,7 +6,7 @@
 import { ITerminal } from '../Types';
 import { IRenderDimensions } from './Types';
 import { BaseRenderLayer } from './BaseRenderLayer';
-import { IColorSet } from 'ui/Types';
+import { IColorSet } from 'browser/Types';
 
 interface ISelectionState {
   start: [number, number];

src/renderer/TextRenderLayer.ts

@@ -10,7 +10,7 @@ import { GridCache } from './GridCache';
 import { BaseRenderLayer } from './BaseRenderLayer';
 import { CellData, AttributeData, Content, NULL_CELL_CODE } from 'common/buffer/BufferLine';
 import { JoinedCellData } from './CharacterJoinerRegistry';
-import { IColorSet } from 'ui/Types';
+import { IColorSet } from 'browser/Types';
 
 /**
  * This CharData looks like a null character, which will forc a clear and render

src/renderer/Types.ts

@@ -5,7 +5,7 @@
 
 import { ITerminal, CharacterJoinerHandler } from '../Types';
 import { IDisposable } from 'xterm';
-import { IColorSet } from 'ui/Types';
+import { IColorSet } from 'browser/Types';
 
 /**
  * Flags used to render terminal text properly.

src/renderer/atlas/CharAtlasCache.ts

@@ -8,7 +8,7 @@ import { generateConfig, configEquals } from './CharAtlasUtils';
 import { BaseCharAtlas } from './BaseCharAtlas';
 import { DynamicCharAtlas } from './DynamicCharAtlas';
 import { ICharAtlasConfig } from './Types';
-import { IColorSet } from 'ui/Types';
+import { IColorSet } from 'browser/Types';
 
 interface ICharAtlasCacheEntry {
   atlas: BaseCharAtlas;

src/renderer/atlas/CharAtlasUtils.ts

@@ -6,7 +6,7 @@
 import { ITerminal } from '../../Types';
 import { ICharAtlasConfig } from './Types';
 import { DEFAULT_COLOR } from 'common/Types';
-import { IColorSet } from 'ui/Types';
+import { IColorSet } from 'browser/Types';
 
 export function generateConfig(scaledCharWidth: number, scaledCharHeight: number, terminal: ITerminal, colors: IColorSet): ICharAtlasConfig {
   // null out some fields that don't matter

src/renderer/atlas/DynamicCharAtlas.ts

@@ -5,10 +5,10 @@
 
 import { DIM_OPACITY, IGlyphIdentifier, INVERTED_DEFAULT_COLOR, ICharAtlasConfig } from './Types';
 import { BaseCharAtlas } from './BaseCharAtlas';
-import { DEFAULT_ANSI_COLORS } from 'ui/ColorManager';
+import { DEFAULT_ANSI_COLORS } from 'browser/ColorManager';
 import { LRUMap } from './LRUMap';
 import { isFirefox, isSafari } from 'common/Platform';
-import { IColor } from 'ui/Types';
+import { IColor } from 'browser/Types';
 
 // In practice we're probably never going to exhaust a texture this large. For debugging purposes,
 // however, it can be useful to set this to a really tiny value, to verify that LRU eviction works.

src/renderer/atlas/Types.ts

@@ -4,7 +4,7 @@
  */
 
 import { FontWeight } from 'xterm';
-import { IColorSet } from 'ui/Types';
+import { IColorSet } from 'browser/Types';
 
 export const INVERTED_DEFAULT_COLOR = 257;
 export const DIM_OPACITY = 0.5;

src/renderer/dom/DomRenderer.ts

@@ -8,8 +8,8 @@ import { ILinkifierEvent, ITerminal, CharacterJoinerHandler } from '../../Types'
 import { BOLD_CLASS, ITALIC_CLASS, CURSOR_CLASS, CURSOR_STYLE_BLOCK_CLASS, CURSOR_BLINK_CLASS, CURSOR_STYLE_BAR_CLASS, CURSOR_STYLE_UNDERLINE_CLASS, DomRendererRowFactory } from './DomRendererRowFactory';
 import { INVERTED_DEFAULT_COLOR } from '../atlas/Types';
 import { Disposable } from 'common/Lifecycle';
-import { IColorSet } from 'ui/Types';
-import { ICharSizeService } from 'ui/services/Services';
+import { IColorSet } from 'browser/Types';
+import { ICharSizeService } from 'browser/services/Services';
 
 const TERMINAL_CLASS_PREFIX = 'xterm-dom-renderer-owner-';
 const ROW_CONTAINER_CLASS = 'xterm-rows';

src/tsconfig.json

@@ -14,7 +14,7 @@
     "baseUrl": ".",
     "paths": {
       "common/*": [ "./common/*" ],
-      "ui/*": [ "./ui/*" ]
+      "browser/*": [ "./browser/*" ]
     },
 
     "noUnusedLocals": true,
@@ -29,6 +29,6 @@
   ],
   "references": [
     { "path": "./common" },
-    { "path": "./ui" }
+    { "path": "./browser" }
   ]
 }

webpack.config.js

@@ -29,8 +29,7 @@ module.exports = {
     extensions: [ '.js' ],
     alias: {
       common: path.resolve('./out/common'),
-      core: path.resolve('./out/core'),
-      ui: path.resolve('./out/ui')
+      browser: path.resolve('./out/browser')
     }
   },
   output: {