Merge branch 'master' into fix-cursor

README.md

@@ -85,13 +85,9 @@ The xterm.js team maintains the following addons but they can be built by anyone
 
 ## Browser Support
 
-Since xterm.js is typically implemented as a developer tool, only modern browsers are supported officially. Here is a list of the versions we aim to support:
+Since xterm.js is typically implemented as a developer tool, only modern browsers are supported officially. Specifically the latest versions of *Chrome*, *Edge*, *Firefox* and *Safari*.
 
-- Chrome latest
-- Edge latest
-- Firefox latest
-- Safari latest
-- IE11
+We also partially support *Intenet Explorer 11*, meaning xterm.js should work for the most part, but we reserve the right to not provide workarounds specifically for it unless it's absolutely necessary to get the basic input/output flow working.
 
 Xterm.js works seamlessly in [Electron](https://electronjs.org/) apps and may even work on earlier versions of the browsers, these are the versions we strive to keep working.
 

addons/xterm-addon-attach/package.json

@@ -1,15 +1,18 @@
 {
   "name": "xterm-addon-attach",
-  "version": "0.1.0-beta10",
+  "version": "0.1.0-beta11",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
   },
-  "main": "lib/AttachAddon.js",
+  "main": "lib/xterm-addon-attach.js",
   "types": "typings/xterm-addon-attach.d.ts",
   "license": "MIT",
   "scripts": {
-    "prepublishOnly": "../../node_modules/.bin/tsc -p src"
+    "build": "../../node_modules/.bin/tsc -p src",
+    "prepackage": "npm run build",
+    "package": "../../node_modules/.bin/webpack",
+    "prepublishOnly": "npm run package"
   },
   "peerDependencies": {
     "xterm": "^3.14.0"

addons/xterm-addon-attach/src/tsconfig.json

@@ -7,7 +7,7 @@
       "es2015"
     ],
     "rootDir": ".",
-    "outDir": "../lib",
+    "outDir": "../out",
     "sourceMap": true,
     "removeComments": true,
     "strict": true

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2019 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+const path = require('path');
+
+const addonName = 'AttachAddon';
+const mainFile = 'xterm-addon-attach.js';
+
+module.exports = {
+  entry: `./out/${addonName}.js`,
+  devtool: 'source-map',
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        use: ["source-map-loader"],
+        enforce: "pre",
+        exclude: /node_modules/
+      }
+    ]
+  },
+  output: {
+    filename: mainFile,
+    path: path.resolve('./lib'),
+    library: addonName,
+    libraryTarget: 'umd'
+  },
+  mode: 'production'
+};

addons/xterm-addon-fit/package.json

@@ -1,15 +1,18 @@
 {
   "name": "xterm-addon-fit",
-  "version": "0.1.0-beta2",
+  "version": "0.1.0-beta3",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
   },
-  "main": "lib/FitAddon.js",
+  "main": "lib/xterm-addon-fit.js",
   "types": "typings/xterm-addon-fit.d.ts",
   "license": "MIT",
   "scripts": {
-    "prepublishOnly": "../../node_modules/.bin/tsc -p src"
+    "build": "../../node_modules/.bin/tsc -p src",
+    "prepackage": "npm run build",
+    "package": "../../node_modules/.bin/webpack",
+    "prepublishOnly": "npm run package"
   },
   "peerDependencies": {
     "xterm": "^3.14.0"

addons/xterm-addon-fit/src/tsconfig.json

@@ -7,7 +7,7 @@
       "es2015"
     ],
     "rootDir": ".",
-    "outDir": "../lib",
+    "outDir": "../out",
     "sourceMap": true,
     "removeComments": true,
     "strict": true

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2019 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+const path = require('path');
+
+const addonName = 'FitAddon';
+const mainFile = 'xterm-addon-fit.js';
+
+module.exports = {
+  entry: `./out/${addonName}.js`,
+  devtool: 'source-map',
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        use: ["source-map-loader"],
+        enforce: "pre",
+        exclude: /node_modules/
+      }
+    ]
+  },
+  output: {
+    filename: mainFile,
+    path: path.resolve('./lib'),
+    library: addonName,
+    libraryTarget: 'umd'
+  },
+  mode: 'production'
+};

addons/xterm-addon-search/package.json

@@ -1,15 +1,18 @@
 {
   "name": "xterm-addon-search",
-  "version": "0.1.0-beta5",
+  "version": "0.1.0-beta6",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
   },
-  "main": "lib/SearchAddon.js",
+  "main": "lib/xterm-addon-search.js",
   "types": "typings/xterm-addon-search.d.ts",
   "license": "MIT",
   "scripts": {
-    "prepublishOnly": "../../node_modules/.bin/tsc -p src"
+    "build": "../../node_modules/.bin/tsc -p src",
+    "prepackage": "npm run build",
+    "package": "../../node_modules/.bin/webpack",
+    "prepublishOnly": "npm run package"
   },
   "peerDependencies": {
     "xterm": "^3.14.0"

addons/xterm-addon-search/src/tsconfig.json

@@ -7,7 +7,7 @@
       "es6",
     ],
     "rootDir": ".",
-    "outDir": "../lib",
+    "outDir": "../out",
     "sourceMap": true,
     "removeComments": true,
     "strict": true

addons/xterm-addon-search/webpack.config.js

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2019 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+const path = require('path');
+
+const addonName = 'SearchAddon';
+const mainFile = 'xterm-addon-search.js';
+
+module.exports = {
+  entry: `./out/${addonName}.js`,
+  devtool: 'source-map',
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        use: ["source-map-loader"],
+        enforce: "pre",
+        exclude: /node_modules/
+      }
+    ]
+  },
+  output: {
+    filename: mainFile,
+    path: path.resolve('./lib'),
+    library: addonName,
+    libraryTarget: 'umd'
+  },
+  mode: 'production'
+};

addons/xterm-addon-web-links/package.json

@@ -1,15 +1,18 @@
 {
   "name": "xterm-addon-web-links",
-  "version": "0.1.0-beta9",
+  "version": "0.1.0-beta10",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
   },
-  "main": "lib/WebLinksAddon.js",
+  "main": "lib/xterm-addon-web-links.js",
   "types": "typings/xterm-addon-web-links.d.ts",
   "license": "MIT",
   "scripts": {
-    "prepublishOnly": "../../node_modules/.bin/tsc -p src"
+    "build": "../../node_modules/.bin/tsc -p src",
+    "prepackage": "npm run build",
+    "package": "../../node_modules/.bin/webpack",
+    "prepublishOnly": "npm run package"
   },
   "peerDependencies": {
     "xterm": "^3.14.0"

addons/xterm-addon-web-links/src/tsconfig.json

@@ -7,7 +7,7 @@
       "es2015"
     ],
     "rootDir": ".",
-    "outDir": "../lib",
+    "outDir": "../out",
     "sourceMap": true,
     "removeComments": true,
     "strict": true

addons/xterm-addon-web-links/webpack.config.js

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2019 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+const path = require('path');
+
+const addonName = 'WebLinksAddon';
+const mainFile = 'xterm-addon-web-links.js';
+
+module.exports = {
+  entry: `./out/${addonName}.js`,
+  devtool: 'source-map',
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        use: ["source-map-loader"],
+        enforce: "pre",
+        exclude: /node_modules/
+      }
+    ]
+  },
+  output: {
+    filename: mainFile,
+    path: path.resolve('./lib'),
+    library: addonName,
+    libraryTarget: 'umd'
+  },
+  mode: 'production'
+};

demo/client.ts

@@ -9,13 +9,17 @@
 
 // Use tsc version (yarn watch)
 import { Terminal } from '../out/public/Terminal';
+import { AttachAddon } from '../addons/xterm-addon-attach/out/AttachAddon';
+import { FitAddon } from '../addons/xterm-addon-fit/out/FitAddon';
+import { SearchAddon, ISearchOptions } from '../addons/xterm-addon-search/out/SearchAddon';
+import { WebLinksAddon } from '../addons/xterm-addon-web-links/out/WebLinksAddon';
+
 // Use webpacked version (yarn package)
 // import { Terminal } from '../lib/xterm';
-
-import { AttachAddon } from 'xterm-addon-attach';
-import { FitAddon } from 'xterm-addon-fit';
-import { SearchAddon, ISearchOptions } from 'xterm-addon-search';
-import { WebLinksAddon } from 'xterm-addon-web-links';
+// import { AttachAddon } from 'xterm-addon-attach';
+// import { FitAddon } from 'xterm-addon-fit';
+// import { SearchAddon, ISearchOptions } from 'xterm-addon-search';
+// import { WebLinksAddon } from 'xterm-addon-web-links';
 
 // Pulling in the module's types relies on the <reference> above, it's looks a
 // little weird here as we're importing "this" module

package.json

@@ -3,6 +3,7 @@
   "description": "Full xterm terminal, in your browser",
   "version": "3.14.0",
   "main": "lib/xterm.js",
+  "style": "css/xterm.css",
   "types": "typings/xterm.d.ts",
   "repository": "https://github.com/xtermjs/xterm.js",
   "license": "MIT",

src/Clipboard.ts

@@ -5,15 +5,6 @@
 
 import { ITerminal, ISelectionManager } from './Types';
 
-interface IWindow extends Window {
-  clipboardData?: {
-    getData(format: string): string;
-    setData(format: string, data: string): void;
-  };
-}
-
-declare var window: IWindow;
-
 /**
  * Prepares text to be pasted into the terminal by normalizing the line endings
  * @param text The pasted text that needs processing before inserting into the terminal
@@ -38,12 +29,7 @@ export function bracketTextForPaste(text: string, bracketedPasteMode: boolean):
  * @param ev The original copy event to be handled
  */
 export function copyHandler(ev: ClipboardEvent, term: ITerminal, selectionManager: ISelectionManager): void {
-  if (term.browser.isMSIE) {
-    window.clipboardData.setData('Text', selectionManager.selectionText);
-  } else {
-    ev.clipboardData.setData('text/plain', selectionManager.selectionText);
-  }
-
+  ev.clipboardData.setData('text/plain', selectionManager.selectionText);
   // Prevent or the original text will be copied.
   ev.preventDefault();
 }
@@ -66,16 +52,9 @@ export function pasteHandler(ev: ClipboardEvent, term: ITerminal): void {
     term.cancel(ev);
   };
 
-  if (term.browser.isMSIE) {
-    if (window.clipboardData) {
-      text = window.clipboardData.getData('Text');
-      dispatchPaste(text);
-    }
-  } else {
-    if (ev.clipboardData) {
-      text = ev.clipboardData.getData('text/plain');
-      dispatchPaste(text);
-    }
+  if (ev.clipboardData) {
+    text = ev.clipboardData.getData('text/plain');
+    dispatchPaste(text);
   }
 }
 

src/InputHandler.test.ts

@@ -8,7 +8,10 @@ import { InputHandler } from './InputHandler';
 import { MockInputHandlingTerminal, TestTerminal } from './TestUtils.test';
 import { Terminal } from './Terminal';
 import { IBufferLine } from 'common/Types';
-import { CellData, Attributes, AttributeData, DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
+import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
+import { CellData } from 'common/buffer/CellData';
+import { Attributes } from 'common/buffer/Constants';
+import { AttributeData } from 'common/buffer/AttributeData';
 
 describe('InputHandler', () => {
   describe('save and restore cursor', () => {

src/InputHandler.ts

@@ -13,9 +13,12 @@ import { IDisposable } from 'xterm';
 import { Disposable } from 'common/Lifecycle';
 import { concat } from 'common/TypedArrayUtils';
 import { StringToUtf32, stringFromCodePoint, utf32ToString, Utf8ToUtf32 } from 'common/input/TextDecoder';
-import { CellData, Attributes, FgFlags, BgFlags, AttributeData, NULL_CELL_WIDTH, NULL_CELL_CODE, DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
+import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
 import { EventEmitter, IEvent } from 'common/EventEmitter';
 import { IParsingState, IDcsHandler, IEscapeSequenceParser } from 'common/parser/Types';
+import { NULL_CELL_CODE, NULL_CELL_WIDTH, Attributes, FgFlags, BgFlags } from 'common/buffer/Constants';
+import { CellData } from 'common/buffer/CellData';
+import { AttributeData } from 'common/buffer/AttributeData';
 
 /**
  * Map collect to glevel. Used in `selectCharset`.

src/Linkifier.test.ts

@@ -9,7 +9,8 @@ import { IBufferLine } from 'common/Types';
 import { Linkifier } from './Linkifier';
 import { MockBuffer, MockTerminal, TestTerminal } from './TestUtils.test';
 import { CircularList } from 'common/CircularList';
-import { BufferLine, CellData } from 'common/buffer/BufferLine';
+import { BufferLine } from 'common/buffer/BufferLine';
+import { CellData } from 'common/buffer/CellData';
 
 class TestLinkifier extends Linkifier {
   constructor(terminal: ITerminal) {

src/SelectionManager.test.ts

@@ -12,9 +12,10 @@ import { IBuffer } from 'common/buffer/Types';
 import { IBufferLine } from 'common/Types';
 import { MockTerminal } from './TestUtils.test';
 import { MockOptionsService, MockBufferService } from 'common/TestUtils.test';
-import { BufferLine, CellData } from 'common/buffer/BufferLine';
+import { BufferLine } from 'common/buffer/BufferLine';
 import { IBufferService } from 'common/services/Services';
 import { MockCharSizeService } from 'browser/TestUtils.test';
+import { CellData } from 'common/buffer/CellData';
 
 class TestMockTerminal extends MockTerminal {
   emit(event: string, data: any): void {}