From 50d6711fc8bb527f65fff453f6ed154ab6f025b3 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Sat, 15 Jun 2019 00:01:00 -0700
Subject: [PATCH] Fix webgl packaging

---
 .../src/{WebglRendererAddon.ts => WebglAddon.ts}       |  2 +-
 addons/xterm-addon-webgl/webpack.config.js             | 10 +++++++++-
 demo/client.ts                                         |  5 +++--
 3 files changed, 13 insertions(+), 4 deletions(-)
 rename addons/xterm-addon-webgl/src/{WebglRendererAddon.ts => WebglAddon.ts} (93%)

diff --git a/addons/xterm-addon-webgl/src/WebglRendererAddon.ts b/addons/xterm-addon-webgl/src/WebglAddon.ts
similarity index 93%
rename from addons/xterm-addon-webgl/src/WebglRendererAddon.ts
rename to addons/xterm-addon-webgl/src/WebglAddon.ts
index 4b67e380..0074f9b2 100644
--- a/addons/xterm-addon-webgl/src/WebglRendererAddon.ts
+++ b/addons/xterm-addon-webgl/src/WebglAddon.ts
@@ -8,7 +8,7 @@ import { WebglRenderer } from './WebglRenderer';
 import { IRenderService } from 'browser/services/Services';
 import { IColorSet } from 'browser/Types';
 
-export class WebglRendererAddon implements ITerminalAddon {
+export class WebglAddon implements ITerminalAddon {
   constructor(
     private _preserveDrawingBuffer?: boolean
   ) {}
diff --git a/addons/xterm-addon-webgl/webpack.config.js b/addons/xterm-addon-webgl/webpack.config.js
index 825f6734..578b1102 100644
--- a/addons/xterm-addon-webgl/webpack.config.js
+++ b/addons/xterm-addon-webgl/webpack.config.js
@@ -6,7 +6,7 @@
 const path = require('path');
 
 const addonName = 'WebglAddon';
-const mainFile = 'xterm-addon-weblg.js';
+const mainFile = 'xterm-addon-webgl.js';
 
 module.exports = {
   entry: `./out/${addonName}.js`,
@@ -21,6 +21,14 @@ module.exports = {
       }
     ]
   },
+  resolve: {
+    modules: ['./node_modules'],
+    extensions: [ '.js' ],
+    alias: {
+      common: path.resolve('../../out/common'),
+      browser: path.resolve('../../out/browser')
+    }
+  },
   output: {
     filename: mainFile,
     path: path.resolve('./lib'),
diff --git a/demo/client.ts b/demo/client.ts
index 03d1bb73..83d9b841 100644
--- a/demo/client.ts
+++ b/demo/client.ts
@@ -13,7 +13,7 @@ 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';
-import { WebglRendererAddon } from '../addons/xterm-addon-webgl/out/WebglRendererAddon';
+import { WebglAddon } from '../addons/xterm-addon-webgl/out/WebglAddon';
 
 // Use webpacked version (yarn package)
 // import { Terminal } from '../lib/xterm';
@@ -21,6 +21,7 @@ import { WebglRendererAddon } from '../addons/xterm-addon-webgl/out/WebglRendere
 // import { FitAddon } from 'xterm-addon-fit';
 // import { SearchAddon, ISearchOptions } from 'xterm-addon-search';
 // import { WebLinksAddon } from 'xterm-addon-web-links';
+// import { WebglAddon } from 'xterm-addon-webgl';
 
 // Pulling in the module's types relies on the <reference> above, it's looks a
 // little weird here as we're importing "this" module
@@ -44,7 +45,7 @@ let socketURL;
 let socket;
 let pid;
 
-(<any>window).webgl = () => term.loadAddon(new WebglRendererAddon());
+(<any>window).webgl = () => term.loadAddon(new WebglAddon());
 
 const terminalContainer = document.getElementById('terminal-container');
 const actionElements = {