xtermjs · Tyriar · Nov 12, 2016 · Oct 1, 2016 · Oct 1, 2016 · Oct 8, 2016
diff --git a/.babelrc b/.babelrc
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 node_modules/
 *.swp
-build/*
 .lock-wscript
 out/
 Makefile.gyp
@@ -12,3 +11,4 @@ docs/
 npm-debug.log
 /.idea/
 .env
+dist/*
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 4
+  - 6
 env:
   - CXX=g++-4.8
 addons:

diff --git a/bin/build b/bin/build
@@ -1,38 +1,17 @@
-#! /usr/bin/env node
+#! /usr/bin/env bash
 
-var child_process = require('child_process');
-var fs = require('fs');
+# Build all TypeScript files (including tests) to out/
+tsc
 
-var buildDir = process.env.BUILD_DIR || 'build';
+# Concat all xterm.js files into a single file and output as a UMD to dist/xterm.js
+browserify out/xterm.js --standalone Terminal -p [ tsify ] --outfile dist/xterm.js
 
-if (!fs.existsSync(buildDir)){
-    fs.mkdirSync(buildDir);
-}
+# Copy all CSS files from src/ to dist/
+cd src
+find . -name '*.css' | cpio -pdm ../dist
+cd ..
 
-// Add `node_modules/.bin` to PATH
-process.env.PATH = process.cwd() + '/node_modules/.bin:' + process.env.PATH;
-
-console.log('Building xterm.js into ' + buildDir);
-
-// Build ES2015 modules into ES5 form, then concatenate them,
-// then remove unused require calls and save in output file with source map.
-console.log('  - Building ' + buildDir + '/xterm.js...');
-
-var jsBuildCmd = 'browserify src/xterm.js -s Terminal -t [ babelify --presets [ es2015 ] ] --debug | ';
-jsBuildCmd += 'derequire | exorcist ' + buildDir + '/xterm.js.map > ' + buildDir + '/xterm.js';
-
-var jsBuildProcess = child_process.execSync(jsBuildCmd);
-
-if (jsBuildProcess.status) {
-  console.log(jsBuildProcess.error);
-}
-
-console.log('    OK.');
-
-// Copy CSS into $BUILD_DIR
-console.log('  - Building ' + buildDir + '/xterm.css...');
-
-fs.createReadStream('src/xterm.css').pipe(
-  fs.createWriteStream(buildDir + '/xterm.css')
-);
-console.log('    OK.');
+# Copy addons from out/ to dist/
+cd out/addons
+find . -name '*.js' | cpio -pdm ../../dist/addons
+cd ../..
diff --git a/demo/app.js b/demo/app.js
@@ -8,7 +8,6 @@ var terminals = {},
     logs = {};
 
 app.use('/build', express.static(__dirname + '/../build'));
-app.use('/addons', express.static(__dirname + '/../addons'));
 
 app.get('/', function(req, res){
   res.sendFile(__dirname + '/index.html');

diff --git a/demo/index.html b/demo/index.html
@@ -3,13 +3,13 @@
     <head>
         <title>xterm.js demo</title>
         <link rel="stylesheet" href="../build/xterm.css" />
-        <link rel="stylesheet" href="../addons/fullscreen/fullscreen.css" />
+        <link rel="stylesheet" href="../build/addons/fullscreen/fullscreen.css" />
         <link rel="stylesheet" href="style.css" />
       	<script src="https://cdnjs.cloudflare.com/ajax/libs/fetch/1.0.0/fetch.min.js"></script>
-        <script src="../build/xterm.js" ></script>
-        <script src="../addons/attach/attach.js" ></script>
-        <script src="../addons/fit/fit.js" ></script>
-        <script src="../addons/fullscreen/fullscreen.js" ></script>
+        <script src="/build/xterm.js" ></script>
+        <script src="/build/addons/attach/attach.js" ></script>
+        <script src="/build/addons/fit/fit.js" ></script>
+        <script src="/build/addons/fullscreen/fullscreen.js" ></script>
     </head>
     <body>
         <h1>xterm.js: xterm, in the browser</h1>

diff --git a/package.json b/package.json
@@ -10,26 +10,24 @@
   "repository": "https://github.com/sourcelair/xterm.js",
   "license": "MIT",
   "devDependencies": {
-    "babel-core": "6.14.0",
-    "babel-preset-es2015": "6.14.0",
-    "babelify": "^7.3.0",
+    "@types/node": "^6.0.41",
     "browserify": "^13.1.0",
     "chai": "3.5.0",
-    "derequire": "^2.0.3",
     "docdash": "0.4.0",
-    "exorcist": "^0.4.0",
     "express": "4.13.4",
     "express-ws": "2.0.0-rc.1",
     "glob": "^7.0.5",
     "jsdoc": "3.4.0",
     "mocha": "2.5.3",
     "nodemon": "1.10.2",
     "pty.js": "0.3.1",
-    "sleep": "^3.0.1"
+    "sleep": "^3.0.1",
+    "tsify": "^1.0.7",
+    "typescript": "^2.0.3"
   },
   "scripts": {
-    "start": "nodemon --watch src --watch addons --exec bash -c './bin/build && node demo/app'",
-    "test": "mocha --recursive --compilers js:babel-core/register",
+    "start": "nodemon --watch src --watch addons --watch demo --exec bash -c './bin/build && node demo/app'",
+    "test": "./bin/build && mocha --recursive ./out",
     "build:docs": "jsdoc -c jsdoc.json",
     "build": "./bin/build"
   }

diff --git a/addons/attach/attach.js → src/addons/attach/attach.js b/addons/attach/attach.js → src/addons/attach/attach.js
@@ -11,12 +11,12 @@
     /*
      * CommonJS environment
      */
-    module.exports = attach(require('../../dist/xterm'));
+    module.exports = attach(require('../../xterm'));
   } else if (typeof define == 'function') {
     /*
      * Require.js is available
      */
-    define(['../../dist/xterm'], attach);
+    define(['../../xterm'], attach);
   } else {
     /*
      * Plain browser environment

diff --git a/addons/attach/index.html → src/addons/attach/index.html b/addons/attach/index.html → src/addons/attach/index.html
diff --git a/addons/attach/package.json → src/addons/attach/package.json b/addons/attach/package.json → src/addons/attach/package.json
diff --git a/addons/fit/fit.js → src/addons/fit/fit.js b/addons/fit/fit.js → src/addons/fit/fit.js
@@ -16,12 +16,12 @@
     /*
      * CommonJS environment
      */
-    module.exports = fit(require('../../dist/xterm'));
+    module.exports = fit(require('../../xterm'));
   } else if (typeof define == 'function') {
     /*
      * Require.js is available
      */
-    define(['../../dist/xterm'], fit);
+    define(['../../xterm'], fit);
   } else {
     /*
      * Plain browser environment

diff --git a/addons/fit/package.json → src/addons/fit/package.json b/addons/fit/package.json → src/addons/fit/package.json
diff --git a/addons/fullscreen/fullscreen.css → src/addons/fullscreen/fullscreen.css b/addons/fullscreen/fullscreen.css → src/addons/fullscreen/fullscreen.css
diff --git a/addons/fullscreen/fullscreen.js → src/addons/fullscreen/fullscreen.js b/addons/fullscreen/fullscreen.js → src/addons/fullscreen/fullscreen.js
@@ -15,12 +15,12 @@
     /*
      * CommonJS environment
      */
-    module.exports = fullscreen(require('../../dist/xterm'));
+    module.exports = fullscreen(require('../../xterm'));
   } else if (typeof define == 'function') {
     /*
      * Require.js is available
      */
-    define(['../../dist/xterm'], fullscreen);
+    define(['../../xterm'], fullscreen);
   } else {
     /*
      * Plain browser environment

diff --git a/addons/fullscreen/package.json → src/addons/fullscreen/package.json b/addons/fullscreen/package.json → src/addons/fullscreen/package.json
diff --git a/addons/linkify/index.html → src/addons/linkify/index.html b/addons/linkify/index.html → src/addons/linkify/index.html
diff --git a/addons/linkify/linkify.js → src/addons/linkify/linkify.js b/addons/linkify/linkify.js → src/addons/linkify/linkify.js
@@ -3,12 +3,12 @@
     /*
      * CommonJS environment
      */
-    module.exports = linkify(require('../../dist/xterm'));
+    module.exports = linkify(require('../../xterm'));
   } else if (typeof define == 'function') {
     /*
      * Require.js is available
      */
-    define(['../../dist/xterm'], linkify);
+    define(['../../xterm'], linkify);
   } else {
     /*
      * Plain browser environment

diff --git a/addons/linkify/package.json → src/addons/linkify/package.json b/addons/linkify/package.json → src/addons/linkify/package.json
diff --git a/addons/terminado/package.json → src/addons/terminado/package.json b/addons/terminado/package.json → src/addons/terminado/package.json
diff --git a/addons/terminado/terminado.js → src/addons/terminado/terminado.js b/addons/terminado/terminado.js → src/addons/terminado/terminado.js
@@ -11,12 +11,12 @@
     /*
      * CommonJS environment
      */
-    module.exports = attach(require('../../src/xterm'));
+    module.exports = attach(require('../../xterm'));
   } else if (typeof define == 'function') {
     /*
      * Require.js is available
      */
-    define(['../../src/xterm'], attach);
+    define(['../../xterm'], attach);
   } else {
     /*
      * Plain browser environment

diff --git a/test/addons/linkify-test.js → src/test/addons/linkify-test.js b/test/addons/linkify-test.js → src/test/addons/linkify-test.js
@@ -1,5 +1,5 @@
 var assert = require('chai').assert;
-var Terminal = require('../../dist/xterm');
+var Terminal = require('../../xterm');
 var linkify = require('../../addons/linkify/linkify');
 
 describe('linkify addon', function () {

diff --git a/test/addons/test.js → src/test/addons/test.js b/test/addons/test.js → src/test/addons/test.js
@@ -1,11 +1,10 @@
 var assert = require('chai').assert;
-var Terminal = require('../../src/xterm');
-var distTerminal = require('../../dist/xterm');
+var Terminal = require('../../xterm');
 
 describe('xterm.js addons', function() {
   it('should load addons with Terminal.loadAddon', function () {
     Terminal.loadAddon('attach');
     // Test that addon was loaded successfully
-    assert.equal(typeof distTerminal.prototype.attach, 'function');
+    assert.equal(typeof Terminal.prototype.attach, 'function');
   });
 });
diff --git a/test/clipboard-test.js → src/test/clipboard-test.js b/test/clipboard-test.js → src/test/clipboard-test.js
@@ -1,6 +1,6 @@
 var assert = require('chai').assert;
-var Terminal = require('../src/xterm');
-var Clipboard = require('../src/handlers/Clipboard');
+var Terminal = require('../xterm');
+var Clipboard = require('../handlers/Clipboard');
 
 
 describe('evaluateCopiedTextProcessing', function () {

diff --git a/test/composition-helper-test.js → src/test/composition-helper-test.js b/test/composition-helper-test.js → src/test/composition-helper-test.js
@@ -1,5 +1,5 @@
 var assert = require('chai').assert;
-var Terminal = require('../src/xterm');
+var Terminal = require('../xterm');
 
 describe('CompositionHelper', function () {
   var terminal;

diff --git a/test/escape_sequences.js → src/test/escape-sequences-test.js b/test/escape_sequences.js → src/test/escape-sequences-test.js
@@ -2,7 +2,7 @@ var glob = require('glob');
 var fs = require('fs');
 var pty = require('pty.js');
 var sleep = require('sleep');
-var Terminal = require('../src/xterm');
+var Terminal = require('../xterm');
 
 var CONSOLE_LOG = console.log;
 
@@ -80,9 +80,10 @@ describe('xterm output comparison', function() {
 
   // omit stack trace for escape sequence files
   Error.stackTraceLimit = 0;
-  var files = glob.sync('test/escape_sequence_files/*.in');
+  var files = glob.sync('**/escape_sequence_files/*.in');
   // only successful tests for now
   var successful = [0, 2, 6, 12, 13, 18, 20, 22, 27, 28];
+  console.log(files);
   for (var a in successful) {
     var i = successful[a];
     (function(filename){

diff --git a/test/escape_sequence_files/NOTES → src/test/escape_sequence_files/NOTES b/test/escape_sequence_files/NOTES → src/test/escape_sequence_files/NOTES
diff --git a/...ape_sequence_files/t0001-all_printable.in → ...ape_sequence_files/t0001-all_printable.in b/...ape_sequence_files/t0001-all_printable.in → ...ape_sequence_files/t0001-all_printable.in
diff --git a/...e_sequence_files/t0001-all_printable.text → ...e_sequence_files/t0001-all_printable.text b/...e_sequence_files/t0001-all_printable.text → ...e_sequence_files/t0001-all_printable.text
diff --git a/test/escape_sequence_files/t0002-history.in → ...st/escape_sequence_files/t0002-history.in b/test/escape_sequence_files/t0002-history.in → ...st/escape_sequence_files/t0002-history.in
diff --git a/.../escape_sequence_files/t0002-history.text → .../escape_sequence_files/t0002-history.text b/.../escape_sequence_files/t0002-history.text → .../escape_sequence_files/t0002-history.text
diff --git a/...pe_sequence_files/t0002j-simple_string.in → ...pe_sequence_files/t0002j-simple_string.in b/...pe_sequence_files/t0002j-simple_string.in → ...pe_sequence_files/t0002j-simple_string.in
diff --git a/..._sequence_files/t0002j-simple_string.text → ..._sequence_files/t0002j-simple_string.text b/..._sequence_files/t0002j-simple_string.text → ..._sequence_files/t0002j-simple_string.text
diff --git a/.../escape_sequence_files/t0003-line_wrap.in → .../escape_sequence_files/t0003-line_wrap.in b/.../escape_sequence_files/t0003-line_wrap.in → .../escape_sequence_files/t0003-line_wrap.in
diff --git a/...scape_sequence_files/t0003-line_wrap.text → ...scape_sequence_files/t0003-line_wrap.text b/...scape_sequence_files/t0003-line_wrap.text → ...scape_sequence_files/t0003-line_wrap.text
diff --git a/test/escape_sequence_files/t0003j-LF.in → src/test/escape_sequence_files/t0003j-LF.in b/test/escape_sequence_files/t0003j-LF.in → src/test/escape_sequence_files/t0003j-LF.in
diff --git a/test/escape_sequence_files/t0003j-LF.text → ...test/escape_sequence_files/t0003j-LF.text b/test/escape_sequence_files/t0003j-LF.text → ...test/escape_sequence_files/t0003j-LF.text
diff --git a/test/escape_sequence_files/t0004-LF.in → src/test/escape_sequence_files/t0004-LF.in b/test/escape_sequence_files/t0004-LF.in → src/test/escape_sequence_files/t0004-LF.in
diff --git a/test/escape_sequence_files/t0004-LF.text → src/test/escape_sequence_files/t0004-LF.text b/test/escape_sequence_files/t0004-LF.text → src/test/escape_sequence_files/t0004-LF.text
diff --git a/test/escape_sequence_files/t0004j-CR.in → src/test/escape_sequence_files/t0004j-CR.in b/test/escape_sequence_files/t0004j-CR.in → src/test/escape_sequence_files/t0004j-CR.in
diff --git a/test/escape_sequence_files/t0004j-CR.text → ...test/escape_sequence_files/t0004j-CR.text b/test/escape_sequence_files/t0004j-CR.text → ...test/escape_sequence_files/t0004j-CR.text
diff --git a/test/escape_sequence_files/t0005-CR.in → src/test/escape_sequence_files/t0005-CR.in b/test/escape_sequence_files/t0005-CR.in → src/test/escape_sequence_files/t0005-CR.in
diff --git a/test/escape_sequence_files/t0005-CR.text → src/test/escape_sequence_files/t0005-CR.text b/test/escape_sequence_files/t0005-CR.text → src/test/escape_sequence_files/t0005-CR.text
diff --git a/test/escape_sequence_files/t0006-IND.in → src/test/escape_sequence_files/t0006-IND.in b/test/escape_sequence_files/t0006-IND.in → src/test/escape_sequence_files/t0006-IND.in
diff --git a/test/escape_sequence_files/t0006-IND.text → ...test/escape_sequence_files/t0006-IND.text b/test/escape_sequence_files/t0006-IND.text → ...test/escape_sequence_files/t0006-IND.text
diff --git a/...cape_sequence_files/t0007-space_at_end.in → ...cape_sequence_files/t0007-space_at_end.in b/...cape_sequence_files/t0007-space_at_end.in → ...cape_sequence_files/t0007-space_at_end.in
diff --git a/...pe_sequence_files/t0007-space_at_end.text → ...pe_sequence_files/t0007-space_at_end.text b/...pe_sequence_files/t0007-space_at_end.text → ...pe_sequence_files/t0007-space_at_end.text
diff --git a/test/escape_sequence_files/t0008-BS.in → src/test/escape_sequence_files/t0008-BS.in b/test/escape_sequence_files/t0008-BS.in → src/test/escape_sequence_files/t0008-BS.in
diff --git a/test/escape_sequence_files/t0008-BS.text → src/test/escape_sequence_files/t0008-BS.text b/test/escape_sequence_files/t0008-BS.text → src/test/escape_sequence_files/t0008-BS.text
diff --git a/test/escape_sequence_files/t0009-NEL.in → src/test/escape_sequence_files/t0009-NEL.in b/test/escape_sequence_files/t0009-NEL.in → src/test/escape_sequence_files/t0009-NEL.in
diff --git a/test/escape_sequence_files/t0009-NEL.text → ...test/escape_sequence_files/t0009-NEL.text b/test/escape_sequence_files/t0009-NEL.text → ...test/escape_sequence_files/t0009-NEL.text
diff --git a/test/escape_sequence_files/t0010-RI.in → src/test/escape_sequence_files/t0010-RI.in b/test/escape_sequence_files/t0010-RI.in → src/test/escape_sequence_files/t0010-RI.in
diff --git a/test/escape_sequence_files/t0010-RI.text → src/test/escape_sequence_files/t0010-RI.text b/test/escape_sequence_files/t0010-RI.text → src/test/escape_sequence_files/t0010-RI.text
diff --git a/.../escape_sequence_files/t0011-RI_scroll.in → .../escape_sequence_files/t0011-RI_scroll.in b/.../escape_sequence_files/t0011-RI_scroll.in → .../escape_sequence_files/t0011-RI_scroll.in
diff --git a/...scape_sequence_files/t0011-RI_scroll.text → ...scape_sequence_files/t0011-RI_scroll.text b/...scape_sequence_files/t0011-RI_scroll.text → ...scape_sequence_files/t0011-RI_scroll.text
diff --git a/test/escape_sequence_files/t0012-VT.in → src/test/escape_sequence_files/t0012-VT.in b/test/escape_sequence_files/t0012-VT.in → src/test/escape_sequence_files/t0012-VT.in
diff --git a/test/escape_sequence_files/t0012-VT.text → src/test/escape_sequence_files/t0012-VT.text b/test/escape_sequence_files/t0012-VT.text → src/test/escape_sequence_files/t0012-VT.text
diff --git a/test/escape_sequence_files/t0013-FF.in → src/test/escape_sequence_files/t0013-FF.in b/test/escape_sequence_files/t0013-FF.in → src/test/escape_sequence_files/t0013-FF.in
diff --git a/test/escape_sequence_files/t0013-FF.text → src/test/escape_sequence_files/t0013-FF.text b/test/escape_sequence_files/t0013-FF.text → src/test/escape_sequence_files/t0013-FF.text
diff --git a/test/escape_sequence_files/t0014-CAN.in → src/test/escape_sequence_files/t0014-CAN.in b/test/escape_sequence_files/t0014-CAN.in → src/test/escape_sequence_files/t0014-CAN.in
diff --git a/test/escape_sequence_files/t0014-CAN.text → ...test/escape_sequence_files/t0014-CAN.text b/test/escape_sequence_files/t0014-CAN.text → ...test/escape_sequence_files/t0014-CAN.text
diff --git a/test/escape_sequence_files/t0015-SUB.in → src/test/escape_sequence_files/t0015-SUB.in b/test/escape_sequence_files/t0015-SUB.in → src/test/escape_sequence_files/t0015-SUB.in
diff --git a/test/escape_sequence_files/t0015-SUB.text → ...test/escape_sequence_files/t0015-SUB.text b/test/escape_sequence_files/t0015-SUB.text → ...test/escape_sequence_files/t0015-SUB.text
diff --git a/test/escape_sequence_files/t0016-SU.in → src/test/escape_sequence_files/t0016-SU.in b/test/escape_sequence_files/t0016-SU.in → src/test/escape_sequence_files/t0016-SU.in
diff --git a/test/escape_sequence_files/t0016-SU.text → src/test/escape_sequence_files/t0016-SU.text b/test/escape_sequence_files/t0016-SU.text → src/test/escape_sequence_files/t0016-SU.text
diff --git a/test/escape_sequence_files/t0017-SD.in → src/test/escape_sequence_files/t0017-SD.in b/test/escape_sequence_files/t0017-SD.in → src/test/escape_sequence_files/t0017-SD.in
diff --git a/test/escape_sequence_files/t0017-SD.text → src/test/escape_sequence_files/t0017-SD.text b/test/escape_sequence_files/t0017-SD.text → src/test/escape_sequence_files/t0017-SD.text
diff --git a/test/escape_sequence_files/t0020-CUF.in → src/test/escape_sequence_files/t0020-CUF.in b/test/escape_sequence_files/t0020-CUF.in → src/test/escape_sequence_files/t0020-CUF.in
diff --git a/test/escape_sequence_files/t0020-CUF.text → ...test/escape_sequence_files/t0020-CUF.text b/test/escape_sequence_files/t0020-CUF.text → ...test/escape_sequence_files/t0020-CUF.text
diff --git a/test/escape_sequence_files/t0021-CUB.in → src/test/escape_sequence_files/t0021-CUB.in b/test/escape_sequence_files/t0021-CUB.in → src/test/escape_sequence_files/t0021-CUB.in
diff --git a/test/escape_sequence_files/t0021-CUB.text → ...test/escape_sequence_files/t0021-CUB.text b/test/escape_sequence_files/t0021-CUB.text → ...test/escape_sequence_files/t0021-CUB.text
diff --git a/test/escape_sequence_files/t0022-CUU.in → src/test/escape_sequence_files/t0022-CUU.in b/test/escape_sequence_files/t0022-CUU.in → src/test/escape_sequence_files/t0022-CUU.in
diff --git a/test/escape_sequence_files/t0022-CUU.text → ...test/escape_sequence_files/t0022-CUU.text b/test/escape_sequence_files/t0022-CUU.text → ...test/escape_sequence_files/t0022-CUU.text
diff --git a/...escape_sequence_files/t0023-CUU_scroll.in → ...escape_sequence_files/t0023-CUU_scroll.in b/...escape_sequence_files/t0023-CUU_scroll.in → ...escape_sequence_files/t0023-CUU_scroll.in
diff --git a/...cape_sequence_files/t0023-CUU_scroll.text → ...cape_sequence_files/t0023-CUU_scroll.text b/...cape_sequence_files/t0023-CUU_scroll.text → ...cape_sequence_files/t0023-CUU_scroll.text
diff --git a/test/escape_sequence_files/t0024-CUD.in → src/test/escape_sequence_files/t0024-CUD.in b/test/escape_sequence_files/t0024-CUD.in → src/test/escape_sequence_files/t0024-CUD.in
diff --git a/test/escape_sequence_files/t0024-CUD.text → ...test/escape_sequence_files/t0024-CUD.text b/test/escape_sequence_files/t0024-CUD.text → ...test/escape_sequence_files/t0024-CUD.text
diff --git a/test/escape_sequence_files/t0025-CUP.in → src/test/escape_sequence_files/t0025-CUP.in b/test/escape_sequence_files/t0025-CUP.in → src/test/escape_sequence_files/t0025-CUP.in
diff --git a/test/escape_sequence_files/t0025-CUP.text → ...test/escape_sequence_files/t0025-CUP.text b/test/escape_sequence_files/t0025-CUP.text → ...test/escape_sequence_files/t0025-CUP.text
diff --git a/test/escape_sequence_files/t0026-CNL.in → src/test/escape_sequence_files/t0026-CNL.in b/test/escape_sequence_files/t0026-CNL.in → src/test/escape_sequence_files/t0026-CNL.in
diff --git a/test/escape_sequence_files/t0026-CNL.text → ...test/escape_sequence_files/t0026-CNL.text b/test/escape_sequence_files/t0026-CNL.text → ...test/escape_sequence_files/t0026-CNL.text
diff --git a/test/escape_sequence_files/t0027-CPL.in → src/test/escape_sequence_files/t0027-CPL.in b/test/escape_sequence_files/t0027-CPL.in → src/test/escape_sequence_files/t0027-CPL.in
diff --git a/test/escape_sequence_files/t0027-CPL.text → ...test/escape_sequence_files/t0027-CPL.text b/test/escape_sequence_files/t0027-CPL.text → ...test/escape_sequence_files/t0027-CPL.text
diff --git a/test/escape_sequence_files/t0030-HPR.in → src/test/escape_sequence_files/t0030-HPR.in b/test/escape_sequence_files/t0030-HPR.in → src/test/escape_sequence_files/t0030-HPR.in
diff --git a/test/escape_sequence_files/t0030-HPR.text → ...test/escape_sequence_files/t0030-HPR.text b/test/escape_sequence_files/t0030-HPR.text → ...test/escape_sequence_files/t0030-HPR.text
diff --git a/test/escape_sequence_files/t0031-HPB.in_ → src/test/escape_sequence_files/t0031-HPB.in_ b/test/escape_sequence_files/t0031-HPB.in_ → src/test/escape_sequence_files/t0031-HPB.in_
diff --git a/test/escape_sequence_files/t0031-HPB.text → ...test/escape_sequence_files/t0031-HPB.text b/test/escape_sequence_files/t0031-HPB.text → ...test/escape_sequence_files/t0031-HPB.text
diff --git a/test/escape_sequence_files/t0032-VPB.in → src/test/escape_sequence_files/t0032-VPB.in b/test/escape_sequence_files/t0032-VPB.in → src/test/escape_sequence_files/t0032-VPB.in
diff --git a/test/escape_sequence_files/t0032-VPB.text → ...test/escape_sequence_files/t0032-VPB.text b/test/escape_sequence_files/t0032-VPB.text → ...test/escape_sequence_files/t0032-VPB.text
diff --git a/...escape_sequence_files/t0033-VPB_scroll.in → ...escape_sequence_files/t0033-VPB_scroll.in b/...escape_sequence_files/t0033-VPB_scroll.in → ...escape_sequence_files/t0033-VPB_scroll.in
diff --git a/...cape_sequence_files/t0033-VPB_scroll.text → ...cape_sequence_files/t0033-VPB_scroll.text b/...cape_sequence_files/t0033-VPB_scroll.text → ...cape_sequence_files/t0033-VPB_scroll.text
diff --git a/test/escape_sequence_files/t0034-VPR.in → src/test/escape_sequence_files/t0034-VPR.in b/test/escape_sequence_files/t0034-VPR.in → src/test/escape_sequence_files/t0034-VPR.in
diff --git a/test/escape_sequence_files/t0034-VPR.text → ...test/escape_sequence_files/t0034-VPR.text b/test/escape_sequence_files/t0034-VPR.text → ...test/escape_sequence_files/t0034-VPR.text
diff --git a/test/escape_sequence_files/t0035-HVP.in → src/test/escape_sequence_files/t0035-HVP.in b/test/escape_sequence_files/t0035-HVP.in → src/test/escape_sequence_files/t0035-HVP.in
diff --git a/test/escape_sequence_files/t0035-HVP.text → ...test/escape_sequence_files/t0035-HVP.text b/test/escape_sequence_files/t0035-HVP.text → ...test/escape_sequence_files/t0035-HVP.text
diff --git a/test/escape_sequence_files/t0040-REP.in → src/test/escape_sequence_files/t0040-REP.in b/test/escape_sequence_files/t0040-REP.in → src/test/escape_sequence_files/t0040-REP.in
diff --git a/test/escape_sequence_files/t0040-REP.text → ...test/escape_sequence_files/t0040-REP.text b/test/escape_sequence_files/t0040-REP.text → ...test/escape_sequence_files/t0040-REP.text
diff --git a/test/escape_sequence_files/t0050-ICH.in → src/test/escape_sequence_files/t0050-ICH.in b/test/escape_sequence_files/t0050-ICH.in → src/test/escape_sequence_files/t0050-ICH.in
diff --git a/test/escape_sequence_files/t0050-ICH.text → ...test/escape_sequence_files/t0050-ICH.text b/test/escape_sequence_files/t0050-ICH.text → ...test/escape_sequence_files/t0050-ICH.text
diff --git a/test/escape_sequence_files/t0051-IL.in → src/test/escape_sequence_files/t0051-IL.in b/test/escape_sequence_files/t0051-IL.in → src/test/escape_sequence_files/t0051-IL.in
diff --git a/test/escape_sequence_files/t0051-IL.text → src/test/escape_sequence_files/t0051-IL.text b/test/escape_sequence_files/t0051-IL.text → src/test/escape_sequence_files/t0051-IL.text
diff --git a/test/escape_sequence_files/t0052-DL.in → src/test/escape_sequence_files/t0052-DL.in b/test/escape_sequence_files/t0052-DL.in → src/test/escape_sequence_files/t0052-DL.in
diff --git a/test/escape_sequence_files/t0052-DL.text → src/test/escape_sequence_files/t0052-DL.text b/test/escape_sequence_files/t0052-DL.text → src/test/escape_sequence_files/t0052-DL.text
diff --git a/test/escape_sequence_files/t0053-DCH.in → src/test/escape_sequence_files/t0053-DCH.in b/test/escape_sequence_files/t0053-DCH.in → src/test/escape_sequence_files/t0053-DCH.in
diff --git a/test/escape_sequence_files/t0053-DCH.text → ...test/escape_sequence_files/t0053-DCH.text b/test/escape_sequence_files/t0053-DCH.text → ...test/escape_sequence_files/t0053-DCH.text
diff --git a/test/escape_sequence_files/t0054-ECH.in → src/test/escape_sequence_files/t0054-ECH.in b/test/escape_sequence_files/t0054-ECH.in → src/test/escape_sequence_files/t0054-ECH.in
diff --git a/test/escape_sequence_files/t0054-ECH.text → ...test/escape_sequence_files/t0054-ECH.text b/test/escape_sequence_files/t0054-ECH.text → ...test/escape_sequence_files/t0054-ECH.text
diff --git a/test/escape_sequence_files/t0055-EL.in → src/test/escape_sequence_files/t0055-EL.in b/test/escape_sequence_files/t0055-EL.in → src/test/escape_sequence_files/t0055-EL.in
diff --git a/test/escape_sequence_files/t0055-EL.text → src/test/escape_sequence_files/t0055-EL.text b/test/escape_sequence_files/t0055-EL.text → src/test/escape_sequence_files/t0055-EL.text
diff --git a/test/escape_sequence_files/t0056-ED.in → src/test/escape_sequence_files/t0056-ED.in b/test/escape_sequence_files/t0056-ED.in → src/test/escape_sequence_files/t0056-ED.in
diff --git a/test/escape_sequence_files/t0056-ED.text → src/test/escape_sequence_files/t0056-ED.text b/test/escape_sequence_files/t0056-ED.text → src/test/escape_sequence_files/t0056-ED.text
diff --git a/test/escape_sequence_files/t0057-ED3.in → src/test/escape_sequence_files/t0057-ED3.in b/test/escape_sequence_files/t0057-ED3.in → src/test/escape_sequence_files/t0057-ED3.in
diff --git a/test/escape_sequence_files/t0057-ED3.note → ...test/escape_sequence_files/t0057-ED3.note b/test/escape_sequence_files/t0057-ED3.note → ...test/escape_sequence_files/t0057-ED3.note
diff --git a/test/escape_sequence_files/t0057-ED3.text → ...test/escape_sequence_files/t0057-ED3.text b/test/escape_sequence_files/t0057-ED3.text → ...test/escape_sequence_files/t0057-ED3.text
diff --git a/test/escape_sequence_files/t0060-DECSC.in → ...test/escape_sequence_files/t0060-DECSC.in b/test/escape_sequence_files/t0060-DECSC.in → ...test/escape_sequence_files/t0060-DECSC.in
diff --git a/test/escape_sequence_files/t0060-DECSC.text → ...st/escape_sequence_files/t0060-DECSC.text b/test/escape_sequence_files/t0060-DECSC.text → ...st/escape_sequence_files/t0060-DECSC.text
diff --git a/test/escape_sequence_files/t0061-CSI_s.in → ...test/escape_sequence_files/t0061-CSI_s.in b/test/escape_sequence_files/t0061-CSI_s.in → ...test/escape_sequence_files/t0061-CSI_s.in
diff --git a/test/escape_sequence_files/t0061-CSI_s.text → ...st/escape_sequence_files/t0061-CSI_s.text b/test/escape_sequence_files/t0061-CSI_s.text → ...st/escape_sequence_files/t0061-CSI_s.text
diff --git a/...escape_sequence_files/t0070-DECSTBM_LF.in → ...escape_sequence_files/t0070-DECSTBM_LF.in b/...escape_sequence_files/t0070-DECSTBM_LF.in → ...escape_sequence_files/t0070-DECSTBM_LF.in
diff --git a/...cape_sequence_files/t0070-DECSTBM_LF.text → ...cape_sequence_files/t0070-DECSTBM_LF.text b/...cape_sequence_files/t0070-DECSTBM_LF.text → ...cape_sequence_files/t0070-DECSTBM_LF.text
diff --git a/...scape_sequence_files/t0071-DECSTBM_IND.in → ...scape_sequence_files/t0071-DECSTBM_IND.in b/...scape_sequence_files/t0071-DECSTBM_IND.in → ...scape_sequence_files/t0071-DECSTBM_IND.in
diff --git a/...ape_sequence_files/t0071-DECSTBM_IND.text → ...ape_sequence_files/t0071-DECSTBM_IND.text b/...ape_sequence_files/t0071-DECSTBM_IND.text → ...ape_sequence_files/t0071-DECSTBM_IND.text
diff --git a/...scape_sequence_files/t0072-DECSTBM_NEL.in → ...scape_sequence_files/t0072-DECSTBM_NEL.in b/...scape_sequence_files/t0072-DECSTBM_NEL.in → ...scape_sequence_files/t0072-DECSTBM_NEL.in
diff --git a/...ape_sequence_files/t0072-DECSTBM_NEL.text → ...ape_sequence_files/t0072-DECSTBM_NEL.text b/...ape_sequence_files/t0072-DECSTBM_NEL.text → ...ape_sequence_files/t0072-DECSTBM_NEL.text
diff --git a/...escape_sequence_files/t0073-DECSTBM_RI.in → ...escape_sequence_files/t0073-DECSTBM_RI.in b/...escape_sequence_files/t0073-DECSTBM_RI.in → ...escape_sequence_files/t0073-DECSTBM_RI.in
diff --git a/...cape_sequence_files/t0073-DECSTBM_RI.text → ...cape_sequence_files/t0073-DECSTBM_RI.text b/...cape_sequence_files/t0073-DECSTBM_RI.text → ...cape_sequence_files/t0073-DECSTBM_RI.text
diff --git a/...ape_sequence_files/t0074-DECSTBM_SU_SD.in → ...ape_sequence_files/t0074-DECSTBM_SU_SD.in b/...ape_sequence_files/t0074-DECSTBM_SU_SD.in → ...ape_sequence_files/t0074-DECSTBM_SU_SD.in
diff --git a/...e_sequence_files/t0074-DECSTBM_SU_SD.text → ...e_sequence_files/t0074-DECSTBM_SU_SD.text b/...e_sequence_files/t0074-DECSTBM_SU_SD.text → ...e_sequence_files/t0074-DECSTBM_SU_SD.text
diff --git a/...e_sequence_files/t0075-DECSTBM_CUU_CUD.in → ...e_sequence_files/t0075-DECSTBM_CUU_CUD.in b/...e_sequence_files/t0075-DECSTBM_CUU_CUD.in → ...e_sequence_files/t0075-DECSTBM_CUU_CUD.in
diff --git a/...sequence_files/t0075-DECSTBM_CUU_CUD.text → ...sequence_files/t0075-DECSTBM_CUU_CUD.text b/...sequence_files/t0075-DECSTBM_CUU_CUD.text → ...sequence_files/t0075-DECSTBM_CUU_CUD.text
diff --git a/...ape_sequence_files/t0076-DECSTBM_IL_DL.in → ...ape_sequence_files/t0076-DECSTBM_IL_DL.in b/...ape_sequence_files/t0076-DECSTBM_IL_DL.in → ...ape_sequence_files/t0076-DECSTBM_IL_DL.in
diff --git a/...e_sequence_files/t0076-DECSTBM_IL_DL.text → ...e_sequence_files/t0076-DECSTBM_IL_DL.text b/...e_sequence_files/t0076-DECSTBM_IL_DL.text → ...e_sequence_files/t0076-DECSTBM_IL_DL.text
diff --git a/...pe_sequence_files/t0077-DECSTBM_quirks.in → ...pe_sequence_files/t0077-DECSTBM_quirks.in b/...pe_sequence_files/t0077-DECSTBM_quirks.in → ...pe_sequence_files/t0077-DECSTBM_quirks.in
diff --git a/..._sequence_files/t0077-DECSTBM_quirks.text → ..._sequence_files/t0077-DECSTBM_quirks.text b/..._sequence_files/t0077-DECSTBM_quirks.text → ..._sequence_files/t0077-DECSTBM_quirks.text
diff --git a/test/escape_sequence_files/t0080-HT.in → src/test/escape_sequence_files/t0080-HT.in b/test/escape_sequence_files/t0080-HT.in → src/test/escape_sequence_files/t0080-HT.in
diff --git a/test/escape_sequence_files/t0080-HT.text → src/test/escape_sequence_files/t0080-HT.text b/test/escape_sequence_files/t0080-HT.text → src/test/escape_sequence_files/t0080-HT.text
diff --git a/test/escape_sequence_files/t0081-TBC.in → src/test/escape_sequence_files/t0081-TBC.in b/test/escape_sequence_files/t0081-TBC.in → src/test/escape_sequence_files/t0081-TBC.in
diff --git a/test/escape_sequence_files/t0081-TBC.text → ...test/escape_sequence_files/t0081-TBC.text b/test/escape_sequence_files/t0081-TBC.text → ...test/escape_sequence_files/t0081-TBC.text
diff --git a/test/escape_sequence_files/t0082-HTS.in → src/test/escape_sequence_files/t0082-HTS.in b/test/escape_sequence_files/t0082-HTS.in → src/test/escape_sequence_files/t0082-HTS.in
diff --git a/test/escape_sequence_files/t0082-HTS.text → ...test/escape_sequence_files/t0082-HTS.text b/test/escape_sequence_files/t0082-HTS.text → ...test/escape_sequence_files/t0082-HTS.text
diff --git a/test/escape_sequence_files/t0083-CHT.in → src/test/escape_sequence_files/t0083-CHT.in b/test/escape_sequence_files/t0083-CHT.in → src/test/escape_sequence_files/t0083-CHT.in
diff --git a/test/escape_sequence_files/t0083-CHT.text → ...test/escape_sequence_files/t0083-CHT.text b/test/escape_sequence_files/t0083-CHT.text → ...test/escape_sequence_files/t0083-CHT.text
diff --git a/test/escape_sequence_files/t0084-CBT.in → src/test/escape_sequence_files/t0084-CBT.in b/test/escape_sequence_files/t0084-CBT.in → src/test/escape_sequence_files/t0084-CBT.in
diff --git a/test/escape_sequence_files/t0084-CBT.text → ...test/escape_sequence_files/t0084-CBT.text b/test/escape_sequence_files/t0084-CBT.text → ...test/escape_sequence_files/t0084-CBT.text
diff --git a/...scape_sequence_files/t0084-CBT.text-xterm → ...scape_sequence_files/t0084-CBT.text-xterm b/...scape_sequence_files/t0084-CBT.text-xterm → ...scape_sequence_files/t0084-CBT.text-xterm
diff --git a/...escape_sequence_files/t0090-alt_screen.in → ...escape_sequence_files/t0090-alt_screen.in b/...escape_sequence_files/t0090-alt_screen.in → ...escape_sequence_files/t0090-alt_screen.in
diff --git a/...cape_sequence_files/t0090-alt_screen.text → ...cape_sequence_files/t0090-alt_screen.text b/...cape_sequence_files/t0090-alt_screen.text → ...cape_sequence_files/t0090-alt_screen.text
diff --git a/...pe_sequence_files/t0091-alt_screen_ED3.in → ...pe_sequence_files/t0091-alt_screen_ED3.in b/...pe_sequence_files/t0091-alt_screen_ED3.in → ...pe_sequence_files/t0091-alt_screen_ED3.in
diff --git a/..._sequence_files/t0091-alt_screen_ED3.text → ..._sequence_files/t0091-alt_screen_ED3.text b/..._sequence_files/t0091-alt_screen_ED3.text → ..._sequence_files/t0091-alt_screen_ED3.text
diff --git a/..._sequence_files/t0092-alt_screen_DECSC.in → ..._sequence_files/t0092-alt_screen_DECSC.in b/..._sequence_files/t0092-alt_screen_DECSC.in → ..._sequence_files/t0092-alt_screen_DECSC.in
diff --git a/...equence_files/t0092-alt_screen_DECSC.text → ...equence_files/t0092-alt_screen_DECSC.text b/...equence_files/t0092-alt_screen_DECSC.text → ...equence_files/t0092-alt_screen_DECSC.text
diff --git a/test/escape_sequence_files/t0100-IRM.in → src/test/escape_sequence_files/t0100-IRM.in b/test/escape_sequence_files/t0100-IRM.in → src/test/escape_sequence_files/t0100-IRM.in
diff --git a/test/escape_sequence_files/t0100-IRM.text → ...test/escape_sequence_files/t0100-IRM.text b/test/escape_sequence_files/t0100-IRM.text → ...test/escape_sequence_files/t0100-IRM.text
diff --git a/test/escape_sequence_files/t0101-NLM.in → src/test/escape_sequence_files/t0101-NLM.in b/test/escape_sequence_files/t0101-NLM.in → src/test/escape_sequence_files/t0101-NLM.in
diff --git a/test/escape_sequence_files/t0101-NLM.text → ...test/escape_sequence_files/t0101-NLM.text b/test/escape_sequence_files/t0101-NLM.text → ...test/escape_sequence_files/t0101-NLM.text
diff --git a/test/escape_sequence_files/t0102-DECAWM.in → ...est/escape_sequence_files/t0102-DECAWM.in b/test/escape_sequence_files/t0102-DECAWM.in → ...est/escape_sequence_files/t0102-DECAWM.in
diff --git a/test/escape_sequence_files/t0102-DECAWM.text → ...t/escape_sequence_files/t0102-DECAWM.text b/test/escape_sequence_files/t0102-DECAWM.text → ...t/escape_sequence_files/t0102-DECAWM.text
diff --git a/...cape_sequence_files/t0103-reverse_wrap.in → ...cape_sequence_files/t0103-reverse_wrap.in b/...cape_sequence_files/t0103-reverse_wrap.in → ...cape_sequence_files/t0103-reverse_wrap.in
diff --git a/...pe_sequence_files/t0103-reverse_wrap.text → ...pe_sequence_files/t0103-reverse_wrap.text b/...pe_sequence_files/t0103-reverse_wrap.text → ...pe_sequence_files/t0103-reverse_wrap.text
diff --git a/test/escape_sequence_files/t0200-SGR.html → ...test/escape_sequence_files/t0200-SGR.html b/test/escape_sequence_files/t0200-SGR.html → ...test/escape_sequence_files/t0200-SGR.html
diff --git a/test/escape_sequence_files/t0200-SGR.in_ → src/test/escape_sequence_files/t0200-SGR.in_ b/test/escape_sequence_files/t0200-SGR.in_ → src/test/escape_sequence_files/t0200-SGR.in_
diff --git a/...ape_sequence_files/t0220-SGR_inverse.html → ...ape_sequence_files/t0220-SGR_inverse.html b/...ape_sequence_files/t0220-SGR_inverse.html → ...ape_sequence_files/t0220-SGR_inverse.html
diff --git a/...cape_sequence_files/t0220-SGR_inverse.in_ → ...cape_sequence_files/t0220-SGR_inverse.in_ b/...cape_sequence_files/t0220-SGR_inverse.in_ → ...cape_sequence_files/t0220-SGR_inverse.in_
diff --git a/...pe_sequence_files/t0500-bash_long_line.in → ...pe_sequence_files/t0500-bash_long_line.in b/...pe_sequence_files/t0500-bash_long_line.in → ...pe_sequence_files/t0500-bash_long_line.in
diff --git a/..._sequence_files/t0500-bash_long_line.text → ..._sequence_files/t0500-bash_long_line.text b/..._sequence_files/t0500-bash_long_line.text → ..._sequence_files/t0500-bash_long_line.text
diff --git a/test/escape_sequence_files/t0501-bash_ls.in → ...st/escape_sequence_files/t0501-bash_ls.in b/test/escape_sequence_files/t0501-bash_ls.in → ...st/escape_sequence_files/t0501-bash_ls.in
diff --git a/.../escape_sequence_files/t0501-bash_ls.text → .../escape_sequence_files/t0501-bash_ls.text b/.../escape_sequence_files/t0501-bash_ls.text → .../escape_sequence_files/t0501-bash_ls.text
diff --git a/...ape_sequence_files/t0502-bash_ls_color.in → ...ape_sequence_files/t0502-bash_ls_color.in b/...ape_sequence_files/t0502-bash_ls_color.in → ...ape_sequence_files/t0502-bash_ls_color.in
diff --git a/...e_sequence_files/t0502-bash_ls_color.text → ...e_sequence_files/t0502-bash_ls_color.text b/...e_sequence_files/t0502-bash_ls_color.text → ...e_sequence_files/t0502-bash_ls_color.text
diff --git a/...cape_sequence_files/t0503-zsh_ls_color.in → ...cape_sequence_files/t0503-zsh_ls_color.in b/...cape_sequence_files/t0503-zsh_ls_color.in → ...cape_sequence_files/t0503-zsh_ls_color.in
diff --git a/...pe_sequence_files/t0503-zsh_ls_color.text → ...pe_sequence_files/t0503-zsh_ls_color.text b/...pe_sequence_files/t0503-zsh_ls_color.text → ...pe_sequence_files/t0503-zsh_ls_color.text
diff --git a/test/escape_sequence_files/t0504-vim.in → src/test/escape_sequence_files/t0504-vim.in b/test/escape_sequence_files/t0504-vim.in → src/test/escape_sequence_files/t0504-vim.in
diff --git a/test/escape_sequence_files/t0504-vim.text → ...test/escape_sequence_files/t0504-vim.text b/test/escape_sequence_files/t0504-vim.text → ...test/escape_sequence_files/t0504-vim.text
diff --git a/test/test.js → src/test/test.js b/test/test.js → src/test/test.js
@@ -1,6 +1,6 @@
 var assert = require('chai').assert;
 var expect = require('chai').expect;
-var Terminal = require('../src/xterm');
+var Terminal = require('../xterm');
 
 describe('xterm.js', function() {
   var xterm;

diff --git a/test/viewport-test.js → src/test/viewport-test.js b/test/viewport-test.js → src/test/viewport-test.js
@@ -1,5 +1,5 @@
 var assert = require('chai').assert;
-var Terminal = require('../src/xterm');
+var Terminal = require('../xterm');
 
 describe('Viewport', function () {
   var terminal;

diff --git a/src/xterm.js b/src/xterm.js
@@ -647,10 +647,10 @@ Terminal.prototype.open = function(parent) {
 Terminal.loadAddon = function(addon, callback) {
   if (typeof exports === 'object' && typeof module === 'object') {
     // CommonJS
-    return require('../addons/' + addon);
+    return require('./addons/' + addon + '/' + addon);
   } else if (typeof define == 'function') {
     // RequireJS
-    return require(['../addons/' + addon + '/' + addon], callback);
+    return require(['./addons/' + addon + '/' + addon], callback);
   } else {
     console.error('Cannot load a module without a CommonJS or RequireJS environment.');
     return false;

diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es5",
+    "rootDir": "src",
+    "allowJs": true,
+    "outDir": "out"
+  },
+  "exclude": [
+    "addons",
+    "build",
+    "demo",
+    "dist",
+    "out",
+    "test",
+    "node_modules"
+  ]
+}
diff --git a/typings.json b/typings.json
@@ -0,0 +1,6 @@
+{
+  "name": "xterm",
+  "globalDependencies": {
+    "node": "registry:env/node#6.0.0+20160918225031"
+  }
+}