Merge branch 'master' into 2148_update_after_ech

.npmignore

@@ -38,6 +38,8 @@
 *.test.js
 *.test.js.map
 lib/test/
+tslint.json
+webpack.config.js
 
 docs/
 /.idea/
@@ -46,3 +48,5 @@ bin/
 build/
 fixtures/
 demo/
+.devcontainer/
+out/

fixtures/typings-test/typings-test.ts

@@ -50,7 +50,6 @@ namespace methods_core {
     const t: Terminal = new Terminal();
     t.blur();
     t.focus();
-    t.destroy();
     t.clear();
     t.refresh(0, 1);
     t.reset();
@@ -148,7 +147,6 @@ namespace methods_core {
       const r18: (data: string) => void = t.getOption('handler');
       const r19: string = t.getOption('bellSound');
       const r20: string = t.getOption('bellStyle');
-      const r21: boolean = t.getOption('enableBold');
       const r22: number = t.getOption('letterSpacing');
       const r23: boolean = t.getOption('macOptionIsMeta');
       const r24: string = t.getOption('fontWeight');
@@ -168,7 +166,6 @@ namespace methods_core {
       t.setOption('cursorBlink', true);
       t.setOption('debug', true);
       t.setOption('disableStdin', true);
-      t.setOption('enableBold', true);
       t.setOption('fontWeight', 'normal');
       t.setOption('fontWeight', 'bold');
       t.setOption('fontWeightBold', 'normal');

src/Terminal.ts

@@ -92,7 +92,6 @@ const DEFAULT_OPTIONS: ITerminalOptions = {
   bellSound: DEFAULT_BELL_SOUND,
   bellStyle: 'none',
   drawBoldTextInBrightColors: true,
-  enableBold: true,
   experimentalCharAtlas: 'static',
   fontFamily: 'courier-new, courier, monospace',
   fontSize: 15,
@@ -290,13 +289,6 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
     }
   }
 
-  /**
-   * @deprecated Use dispose instead.
-   */
-  public destroy(): void {
-    this.dispose();
-  }
-
   private _setup(): void {
     Object.keys(DEFAULT_OPTIONS).forEach((key) => {
       if (this.options[key] === null || this.options[key] === undefined) {
@@ -504,7 +496,6 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
         break;
       case 'drawBoldTextInBrightColors':
       case 'experimentalCharAtlas':
-      case 'enableBold':
       case 'letterSpacing':
       case 'lineHeight':
       case 'fontWeight':

src/TestUtils.test.ts

@@ -99,9 +99,6 @@ export class MockTerminal implements ITerminal {
   dispose(): void {
     throw new Error('Method not implemented.');
   }
-  destroy(): void {
-    throw new Error('Method not implemented.');
-  }
   scrollPages(pageCount: number): void {
     throw new Error('Method not implemented.');
   }

src/Types.ts

@@ -257,7 +257,6 @@ export interface IPublicTerminal extends IDisposable, IEventEmitter {
   selectAll(): void;
   selectLines(start: number, end: number): void;
   dispose(): void;
-  destroy(): void;
   scrollLines(amount: number): void;
   scrollPages(pageCount: number): void;
   scrollToTop(): void;

src/public/Terminal.ts

@@ -121,9 +121,6 @@ export class Terminal implements ITerminalApi {
     this._addonManager.dispose();
     this._core.dispose();
   }
-  public destroy(): void {
-    this._core.destroy();
-  }
   public scrollLines(amount: number): void {
     this._core.scrollLines(amount);
   }
@@ -149,7 +146,7 @@ export class Terminal implements ITerminalApi {
     this._core.writeUtf8(data);
   }
   public getOption(key: 'bellSound' | 'bellStyle' | 'cursorStyle' | 'fontFamily' | 'fontWeight' | 'fontWeightBold' | 'rendererType' | 'termName'): string;
-  public getOption(key: 'allowTransparency' | 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'enableBold' | 'macOptionIsMeta' | 'rightClickSelectsWord' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell'): boolean;
+  public getOption(key: 'allowTransparency' | 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'macOptionIsMeta' | 'rightClickSelectsWord' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell'): boolean;
   public getOption(key: 'colors'): string[];
   public getOption(key: 'cols' | 'fontSize' | 'letterSpacing' | 'lineHeight' | 'rows' | 'tabStopWidth' | 'scrollback'): number;
   public getOption(key: 'handler'): (data: string) => void;
@@ -161,7 +158,7 @@ export class Terminal implements ITerminalApi {
   public setOption(key: 'fontWeight' | 'fontWeightBold', value: 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900'): void;
   public setOption(key: 'bellStyle', value: 'none' | 'visual' | 'sound' | 'both'): void;
   public setOption(key: 'cursorStyle', value: 'block' | 'underline' | 'bar'): void;
-  public setOption(key: 'allowTransparency' | 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'enableBold' | 'macOptionIsMeta' | 'rightClickSelectsWord' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell', value: boolean): void;
+  public setOption(key: 'allowTransparency' | 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'macOptionIsMeta' | 'rightClickSelectsWord' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell', value: boolean): void;
   public setOption(key: 'colors', value: string[]): void;
   public setOption(key: 'fontSize' | 'letterSpacing' | 'lineHeight' | 'tabStopWidth' | 'scrollback', value: number): void;
   public setOption(key: 'handler', value: (data: string) => void): void;

src/renderer/BaseRenderLayer.ts

@@ -288,7 +288,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
     this._currentGlyphIdentifier.code = cell.getCode() || WHITESPACE_CELL_CODE;
     this._currentGlyphIdentifier.bg = bg;
     this._currentGlyphIdentifier.fg = fg;
-    this._currentGlyphIdentifier.bold = cell.isBold() && terminal.options.enableBold;
+    this._currentGlyphIdentifier.bold = !!cell.isBold();
     this._currentGlyphIdentifier.dim = !!cell.isDim();
     this._currentGlyphIdentifier.italic = !!cell.isItalic();
     const atlasDidDraw = this._charAtlas && this._charAtlas.draw(
@@ -316,7 +316,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
    */
   private _drawUncachedChars(terminal: ITerminal, cell: ICellData, x: number, y: number): void {
     this._ctx.save();
-    this._ctx.font = this._getFont(terminal, cell.isBold() && terminal.options.enableBold, !!cell.isItalic());
+    this._ctx.font = this._getFont(terminal, !!cell.isBold(), !!cell.isItalic());
     this._ctx.textBaseline = 'middle';
 
     if (cell.isInverse()) {

src/renderer/dom/DomRendererRowFactory.test.ts

@@ -19,7 +19,6 @@ describe('DomRendererRowFactory', () => {
   beforeEach(() => {
     dom = new jsdom.JSDOM('');
 
-    options.enableBold = true;
     options.drawBoldTextInBrightColors = true;
 
     rowFactory = new DomRendererRowFactory(options, dom.window.document);

src/renderer/dom/DomRendererRowFactory.ts

@@ -77,7 +77,7 @@ export class DomRendererRowFactory {
         }
       }
 
-      if (this._workCell.isBold() && this._terminalOptions.enableBold) {
+      if (this._workCell.isBold()) {
         charElement.classList.add(BOLD_CLASS);
       }
 
@@ -104,8 +104,7 @@ export class DomRendererRowFactory {
         charElement.setAttribute('style', style);
       } else if (this._workCell.isFgPalette()) {
         let fg = this._workCell.getFgColor();
-        if (this._workCell.isBold() && fg < 8 && !swapColor &&
-            this._terminalOptions.enableBold && this._terminalOptions.drawBoldTextInBrightColors) {
+        if (this._workCell.isBold() && fg < 8 && !swapColor && this._terminalOptions.drawBoldTextInBrightColors) {
           fg += 8;
         }
         charElement.classList.add(`xterm-${swapColor ? 'b' : 'f'}g-${fg}`);

typings/xterm.d.ts

@@ -76,13 +76,6 @@ declare module 'xterm' {
      */
     drawBoldTextInBrightColors?: boolean;
 
-    /**
-     * Whether to enable the rendering of bold text.
-     *
-     * @deprecated Use fontWeight and fontWeightBold instead.
-     */
-    enableBold?: boolean;
-
     /**
      * What character atlas implementation to use. The character atlas caches drawn characters,
      * speeding up rendering significantly. However, it can introduce some minor rendering
@@ -706,13 +699,6 @@ declare module 'xterm' {
      */
     dispose(): void;
 
-    /**
-     * Destroys the terminal and detaches it from the DOM.
-     *
-     * @deprecated Use dispose() instead.
-     */
-    destroy(): void;
-
     /**
      * Scroll the display of the terminal
      * @param amount The number of lines to scroll down (negative scroll up).
@@ -775,7 +761,7 @@ declare module 'xterm' {
      * Retrieves an option's value from the terminal.
      * @param key The option key.
      */
-    getOption(key: 'allowTransparency' | 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'enableBold' | 'macOptionIsMeta' | 'rightClickSelectsWord' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell' | 'windowsMode'): boolean;
+    getOption(key: 'allowTransparency' | 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'macOptionIsMeta' | 'rightClickSelectsWord' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell' | 'windowsMode'): boolean;
     /**
      * Retrieves an option's value from the terminal.
      * @param key The option key.
@@ -826,7 +812,7 @@ declare module 'xterm' {
      * @param key The option key.
      * @param value The option value.
      */
-    setOption(key: 'allowTransparency' | 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'enableBold' | 'macOptionIsMeta' | 'popOnBell' | 'rightClickSelectsWord' | 'screenKeys' | 'useFlowControl' | 'visualBell' | 'windowsMode', value: boolean): void;
+    setOption(key: 'allowTransparency' | 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'macOptionIsMeta' | 'popOnBell' | 'rightClickSelectsWord' | 'screenKeys' | 'useFlowControl' | 'visualBell' | 'windowsMode', value: boolean): void;
     /**
      * Sets an option on the terminal.
      * @param key The option key.

webpack.config.js

@@ -13,6 +13,17 @@ const path = require('path');
  */
 module.exports = {
   entry: './out/public/Terminal.js',
+  devtool: 'source-map',
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        use: ["source-map-loader"],
+        enforce: "pre",
+        exclude: /node_modules/
+      }
+    ]
+  },
   resolve: {
     modules: ['./node_modules'],
     extensions: [ '.js' ],