From 8510fc8701344afdfc76e4df7f97b686175dae70 Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <cokoghenun@gitlab.com>
Date: Fri, 2 Mar 2018 20:04:55 +0100
Subject: [PATCH] Removed terminal webpack bundle tag

---
 .../javascripts/pages/projects/environments/terminal/index.js  | 3 +++
 .../javascripts/terminal/{terminal_bundle.js => index.js}      | 2 +-
 app/views/projects/environments/terminal.html.haml             | 1 -
 config/webpack.config.js                                       | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/pages/projects/environments/terminal/index.js
 rename app/assets/javascripts/terminal/{terminal_bundle.js => index.js} (74%)

diff --git a/app/assets/javascripts/pages/projects/environments/terminal/index.js b/app/assets/javascripts/pages/projects/environments/terminal/index.js
new file mode 100644
index 00000000000..7129e24cee1
--- /dev/null
+++ b/app/assets/javascripts/pages/projects/environments/terminal/index.js
@@ -0,0 +1,3 @@
+import initTerminal from '~/terminal/';
+
+document.addEventListener('DOMContentLoaded', initTerminal);
diff --git a/app/assets/javascripts/terminal/terminal_bundle.js b/app/assets/javascripts/terminal/index.js
similarity index 74%
rename from app/assets/javascripts/terminal/terminal_bundle.js
rename to app/assets/javascripts/terminal/index.js
index 134522ef961..1a75e072c4e 100644
--- a/app/assets/javascripts/terminal/terminal_bundle.js
+++ b/app/assets/javascripts/terminal/index.js
@@ -6,4 +6,4 @@ import './terminal';
 
 window.Terminal = Terminal;
 
-$(() => new gl.Terminal({ selector: '#terminal' }));
+export default () => new gl.Terminal({ selector: '#terminal' });
diff --git a/app/views/projects/environments/terminal.html.haml b/app/views/projects/environments/terminal.html.haml
index 7be4ef39117..6ec4ff56552 100644
--- a/app/views/projects/environments/terminal.html.haml
+++ b/app/views/projects/environments/terminal.html.haml
@@ -3,7 +3,6 @@
 
 - content_for :page_specific_javascripts do
   = stylesheet_link_tag "xterm/xterm"
-  = webpack_bundle_tag("terminal")
 
 %div{ class: container_class }
   .top-area
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 959cebe7487..0fedb6a8c72 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -45,7 +45,6 @@ function generateEntries() {
   const manualEntries = {
     monitoring:           './monitoring/monitoring_bundle.js',
     mr_notes:             './mr_notes/index.js',
-    terminal:             './terminal/terminal_bundle.js',
 
     common:               './commons/index.js',
     common_vue:           './vue_shared/vue_resource_interceptor.js',
-- 
GitLab