ui project absolute, tweak demo build

.vscode/tasks.json

@@ -36,7 +36,7 @@
 		},
 		{
 			"label": "Start demo",
-			"dependsOn": ["npm: watch", "npm: start"],
+			"dependsOn": ["npm: watch", "npm: package", "npm: start"],
 			"group": {
 				"kind": "build",
 				"isDefault": true

demo/client.ts

@@ -7,7 +7,11 @@
 
 /// <reference path="../typings/xterm.d.ts"/>
 
-import { Terminal } from '../lib/xterm';
+// Use tsc version (yarn watch)
+import { Terminal } from '../out/public/Terminal';
+// Use webpacked version (yarn package)
+// import { Terminal } from '../lib/xterm';
+
 import { AttachAddon } from 'xterm-addon-attach';
 import { SearchAddon, ISearchOptions } from 'xterm-addon-search';
 import { WebLinksAddon } from 'xterm-addon-web-links';

demo/start.js

@@ -33,10 +33,11 @@ const clientConfig = {
   resolve: {
     modules: [path.resolve(__dirname, '..'), 'node_modules'],
     extensions: [ '.tsx', '.ts', '.js' ],
-    // alias: {
-    //   common: path.resolve(__dirname, '../lib/common'),
-    //   core: path.resolve(__dirname, '../lib/core')
-    // }
+    alias: {
+      common: path.resolve('./out/common'),
+      core: path.resolve('./out/core'),
+      ui: path.resolve('./out/ui')
+    }
   },
   output: {
     filename: 'client-bundle.js',

src/core/tsconfig.json

@@ -9,7 +9,7 @@
     "paths": {
       "common/*": [ "./common/*" ],
       "core/*": [ "./core/*" ]
-    },
+    }
   },
   "include": [ "./**/*" ],
   "references": [

src/ui/ColorManager.test.ts

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

src/ui/ColorManager.ts

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

src/ui/Lifecycle.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IDisposable } from '../common/Types';
+import { IDisposable } from 'common/Types';
 
 /**
  * Adds a disposable listener to a node in the DOM, returning the disposable.

src/ui/RenderDebouncer.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IDisposable } from '../common/Types';
+import { IDisposable } from 'common/Types';
 
 /**
  * Debounces calls to render terminal rows using animation frames.

src/ui/ScreenDprMonitor.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { Disposable } from '../common/Lifecycle';
+import { Disposable } from 'common/Lifecycle';
 
 export type ScreenDprListener = (newDevicePixelRatio?: number, oldDevicePixelRatio?: number) => void;
 

src/ui/tsconfig.json

@@ -8,7 +8,12 @@
     "outDir": "../../out",
     "types": [
       "../../node_modules/@types/mocha"
-    ]
+    ],
+    "baseUrl": "..",
+    "paths": {
+      "common/*": [ "./common/*" ],
+      "ui/*": [ "./ui/*" ]
+    }
   },
   "include": [ "./**/*" ],
   "references": [

webpack.config.js

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