From 6ee524864e5daf4401d2f18d995c0d182b03d78d Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Wed, 5 Oct 2016 13:23:45 +0300
Subject: [PATCH 1/3] Make add-ons load the latest built version

---
 addons/attach/attach.js         | 4 ++--
 addons/fit/fit.js               | 4 ++--
 addons/fullscreen/fullscreen.js | 4 ++--
 addons/linkify/linkify.js       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/attach/attach.js b/addons/attach/attach.js
index 2ef1f737..b74627d1 100644
--- a/addons/attach/attach.js
+++ b/addons/attach/attach.js
@@ -11,12 +11,12 @@
     /*
      * CommonJS environment
      */
-    module.exports = attach(require('../../src/xterm'));
+    module.exports = attach(require('../../dist/xterm'));
   } else if (typeof define == 'function') {
     /*
      * Require.js is available
      */
-    define(['../../src/xterm'], attach);
+    define(['../../dist/xterm'], attach);
   } else {
     /*
      * Plain browser environment
diff --git a/addons/fit/fit.js b/addons/fit/fit.js
index 209e0596..7657c9c4 100644
--- a/addons/fit/fit.js
+++ b/addons/fit/fit.js
@@ -16,12 +16,12 @@
     /*
      * CommonJS environment
      */
-    module.exports = fit(require('../../src/xterm'));
+    module.exports = fit(require('../../dist/xterm'));
   } else if (typeof define == 'function') {
     /*
      * Require.js is available
      */
-    define(['../../src/xterm'], fit);
+    define(['../../dist/xterm'], fit);
   } else {
     /*
      * Plain browser environment
diff --git a/addons/fullscreen/fullscreen.js b/addons/fullscreen/fullscreen.js
index 9a655b32..1579a9c2 100644
--- a/addons/fullscreen/fullscreen.js
+++ b/addons/fullscreen/fullscreen.js
@@ -15,12 +15,12 @@
     /*
      * CommonJS environment
      */
-    module.exports = fullscreen(require('../../src/xterm'));
+    module.exports = fullscreen(require('../../dist/xterm'));
   } else if (typeof define == 'function') {
     /*
      * Require.js is available
      */
-    define(['../../src/xterm'], fullscreen);
+    define(['../../dist/xterm'], fullscreen);
   } else {
     /*
      * Plain browser environment
diff --git a/addons/linkify/linkify.js b/addons/linkify/linkify.js
index 746b4305..8ee9611c 100644
--- a/addons/linkify/linkify.js
+++ b/addons/linkify/linkify.js
@@ -3,12 +3,12 @@
     /*
      * CommonJS environment
      */
-    module.exports = linkify(require('../../src/xterm'));
+    module.exports = linkify(require('../../dist/xterm'));
   } else if (typeof define == 'function') {
     /*
      * Require.js is available
      */
-    define(['../../src/xterm'], linkify);
+    define(['../../dist/xterm'], linkify);
   } else {
     /*
      * Plain browser environment

From 8117999ab3681e940aec26cbfc2809287e749e83 Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Sat, 8 Oct 2016 12:22:18 +0300
Subject: [PATCH 2/3] Fix tests

---
 test/addons/linkify-test.js | 2 +-
 test/addons/test.js         | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/addons/linkify-test.js b/test/addons/linkify-test.js
index 7cb23186..ff871002 100644
--- a/test/addons/linkify-test.js
+++ b/test/addons/linkify-test.js
@@ -1,5 +1,5 @@
 var assert = require('chai').assert;
-var Terminal = require('../../src/xterm');
+var Terminal = require('../../dist/xterm');
 var linkify = require('../../addons/linkify/linkify');
 
 describe('linkify addon', function () {
diff --git a/test/addons/test.js b/test/addons/test.js
index ba689e6e..ddd79ff6 100644
--- a/test/addons/test.js
+++ b/test/addons/test.js
@@ -1,10 +1,11 @@
 var assert = require('chai').assert;
 var Terminal = require('../../src/xterm');
+var distTerminal = require('../../dist/xterm');
 
 describe('xterm.js addons', function() {
   it('should load addons with Terminal.loadAddon', function () {
     Terminal.loadAddon('attach');
-    // Test that function was loaded successfully
-    assert.equal(typeof Terminal.prototype.attach, 'function');
+    // Test that addon was loaded successfully
+    assert.equal(typeof distTerminal.prototype.attach, 'function');
   });
 });

From 763f148fa1b9476dd78172572afe5e06fc7532ed Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Sun, 9 Oct 2016 13:17:17 +0300
Subject: [PATCH 3/3] Remove `__dirname` usage from `loadAddon`

---
 src/xterm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xterm.js b/src/xterm.js
index 83592bb7..b88ed880 100644
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -642,7 +642,7 @@ Terminal.prototype.open = function(parent) {
 Terminal.loadAddon = function(addon, callback) {
   if (typeof exports === 'object' && typeof module === 'object') {
     // CommonJS
-    return require(__dirname + '/../addons/' + addon);
+    return require('../addons/' + addon);
   } else if (typeof define == 'function') {
     // RequireJS
     return require(['../addons/' + addon + '/' + addon], callback);