Merge branch 'terminal-bundle-refactor' into 'master'

Jacob Schatz · Jacob Schatz · commit ddad22c4c4fd · 2018-03-02T19:59:45.000Z
Removed terminal webpack bundle tag

See merge request gitlab-org/gitlab-ce!17494
diff --git a/app/assets/javascripts/pages/projects/environments/terminal/index.js 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/index.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
@@ -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
@@ -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',

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import initTerminal from '~/terminal/';`
	`2`	`+`
	`3`	`+document.addEventListener('DOMContentLoaded', initTerminal);`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ import './terminal';`
`6`	`6`
`7`	`7`	`window.Terminal = Terminal;`
`8`	`8`
`9`		`-$(() => new gl.Terminal({ selector: '#terminal' }));`
	`9`	`+export default () => new gl.Terminal({ selector: '#terminal' });`