From 873f0de0ecb2f9fc89a205b60551e225951458f7 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Sun, 26 May 2019 11:19:42 -0700
Subject: [PATCH] Get webpack build working

---
 .gitignore               |  1 +
 demo/client.ts           |  5 +----
 demo/start.js            |  8 ++++----
 package.json             |  2 +-
 src/common/tsconfig.json |  2 +-
 src/core/tsconfig.json   |  2 +-
 src/tsconfig.json        |  2 +-
 src/ui/tsconfig.json     |  2 +-
 webpack.config.js        | 13 +++++++++----
 9 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index b50ab2d9..366b5429 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ node_modules/
 *.swp
 .lock-wscript
 lib/
+out/
 Makefile.gyp
 *.Makefile
 *.target.gyp.mk
diff --git a/demo/client.ts b/demo/client.ts
index 6de8558c..30cf16ff 100644
--- a/demo/client.ts
+++ b/demo/client.ts
@@ -7,10 +7,7 @@
 
 /// <reference path="../typings/xterm.d.ts"/>
 
-const t = require('../lib2/xterm');
-console.log(t);
-import { Terminal } from '../lib2/xterm';
-console.log('t2', Terminal);
+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';
diff --git a/demo/start.js b/demo/start.js
index 7be2a48e..9b647e5b 100644
--- a/demo/start.js
+++ b/demo/start.js
@@ -33,10 +33,10 @@ 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(__dirname, '../lib/common'),
+    //   core: path.resolve(__dirname, '../lib/core')
+    // }
   },
   output: {
     filename: 'client-bundle.js',
diff --git a/package.json b/package.json
index ad1f7058..90170261 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "xterm",
   "description": "Full xterm terminal, in your browser",
   "version": "3.13.0",
-  "main": "lib/public/Terminal.js",
+  "main": "lib/xterm.js",
   "types": "typings/xterm.d.ts",
   "repository": "https://github.com/xtermjs/xterm.js",
   "license": "MIT",
diff --git a/src/common/tsconfig.json b/src/common/tsconfig.json
index ff0e5c68..82113a9e 100644
--- a/src/common/tsconfig.json
+++ b/src/common/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-library-base",
   "compilerOptions": {
-    "outDir": "../../lib",
+    "outDir": "../../out",
     "types": [
       "../../node_modules/@types/mocha"
     ],
diff --git a/src/core/tsconfig.json b/src/core/tsconfig.json
index 4482140b..91480e24 100644
--- a/src/core/tsconfig.json
+++ b/src/core/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-library-base",
   "compilerOptions": {
-    "outDir": "../../lib",
+    "outDir": "../../out",
     "types": [
       "../../node_modules/@types/mocha"
     ],
diff --git a/src/tsconfig.json b/src/tsconfig.json
index 1e8230a2..8acea77e 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -10,7 +10,7 @@
       "es2015.promise"
     ],
     "rootDir": ".",
-    "outDir": "../lib",
+    "outDir": "../out",
 
     "noUnusedLocals": true,
     "noImplicitAny": true
diff --git a/src/ui/tsconfig.json b/src/ui/tsconfig.json
index e07bd9c3..404d5697 100644
--- a/src/ui/tsconfig.json
+++ b/src/ui/tsconfig.json
@@ -5,7 +5,7 @@
       "dom",
       "es5",
     ],
-    "outDir": "../../lib",
+    "outDir": "../../out",
     "types": [
       "../../node_modules/@types/mocha"
     ]
diff --git a/webpack.config.js b/webpack.config.js
index c2c1a226..543323c1 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,7 +1,12 @@
+/**
+ * Copyright (c) 2019 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 const path = require('path');
 
 module.exports = {
-  entry: './lib/public/Terminal.js',
+  entry: './out/public/Terminal.js',
   devtool: 'inline-source-map',
   module: {
     rules: [
@@ -17,13 +22,13 @@ module.exports = {
     modules: ['./node_modules'],
     extensions: [ '.js' ],
     alias: {
-      common: path.resolve('./lib/common'),
-      core: path.resolve('./lib/core')
+      common: path.resolve('./out/common'),
+      core: path.resolve('./out/core')
     }
   },
   output: {
     filename: 'xterm.js',
-    path: path.resolve('./lib2'),
+    path: path.resolve('./lib'),
     library: 'Terminal',
     libraryTarget: 'umd'
   },