From d223e96fe1abaf03f0052511e7b73f451298c563 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 5 Jul 2016 09:09:01 -0500 Subject: [PATCH 1/3] Switch to xterm for the terminal emulator --- bower.json | 1 - notebook/static/terminal/js/main.js | 3 +-- notebook/static/terminal/js/terminado.js | 2 +- notebook/templates/page.html | 1 - package.json | 3 ++- webpack.config.js | 1 + 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bower.json b/bower.json index ae39400c5..c195dfaed 100644 --- a/bower.json +++ b/bower.json @@ -15,7 +15,6 @@ "MathJax": "components/MathJax#~2.6", "moment": "~2.8.4", "requirejs": "~2.1", - "term.js": "chjj/term.js#~0.0.7", "text-encoding": "~0.1", "underscore": "components/underscore#~1.5", "jquery-typeahead": "~2.0.0" diff --git a/notebook/static/terminal/js/main.js b/notebook/static/terminal/js/main.js index 56a11fde5..d1b02f6c1 100644 --- a/notebook/static/terminal/js/main.js +++ b/notebook/static/terminal/js/main.js @@ -1,8 +1,8 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. __webpack_public_path__ = window['staticURL'] + 'terminal/js/built/'; +require('xterm/src/xterm.css'); -requirejs(['termjs'], function(termjs) { require([ 'base/js/utils', 'base/js/page', @@ -67,4 +67,3 @@ require([ window.terminal = terminal; }); -}); diff --git a/notebook/static/terminal/js/terminado.js b/notebook/static/terminal/js/terminado.js index 5192f713f..179d3ceba 100644 --- a/notebook/static/terminal/js/terminado.js +++ b/notebook/static/terminal/js/terminado.js @@ -1,4 +1,4 @@ -define ([], function() { +define (["xterm"], function(Terminal) { "use strict"; function make_terminal(element, size, ws_url) { var ws = new WebSocket(ws_url); diff --git a/notebook/templates/page.html b/notebook/templates/page.html index 3f4c9f2e2..21976ee7e 100644 --- a/notebook/templates/page.html +++ b/notebook/templates/page.html @@ -40,7 +40,6 @@ backbone : 'components/backbone/backbone-min', moment: 'components/moment/moment', codemirror: 'components/codemirror', - termjs: 'components/term.js/src/term', // Define aliases for requirejs webpack imports notebook: 'built/index', diff --git a/package.json b/package.json index bf9e3fe29..c1ac01312 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "dependencies": { "moment": "^2.8.4", "preact": "^4.5.1", - "preact-compat": "^1.7.0" + "preact-compat": "^1.7.0", + "xterm": "^0.33.0" } } diff --git a/webpack.config.js b/webpack.config.js index 851bc2165..ce651b82a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -18,6 +18,7 @@ var commonConfig = { "node_modules" /* npm */ ] }, + bail: true, module: { loaders: [ { test: /\.js$/, exclude: /node_modules|\/notebook\/static\/component/, loader: "babel-loader"}, From d0708614b54ee4899f8258b04651595a919a0347 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 5 Jul 2016 09:33:26 -0500 Subject: [PATCH 2/3] Add missing webpack loaders --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index c1ac01312..2e30d5028 100644 --- a/package.json +++ b/package.json @@ -27,9 +27,12 @@ "babel-preset-es2015": "^6.6.0", "bower": "*", "concurrently": "^1.0.0", + "css-loader": "^0.23.1", "eslint": "^2.8.0", + "json-loader": "^0.5.4", "less": "~2", "requirejs": "^2.1.17", + "style-loader": "^0.13.1", "underscore": "^1.8.3", "webpack": "^1.12.13" }, From f74608ddaa63db899cd0137d6d8c34e7a46c591b Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 5 Jul 2016 11:55:23 -0500 Subject: [PATCH 3/3] Remove check for term.js file --- setupbase.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setupbase.py b/setupbase.py index 20846aaef..aa0403eab 100644 --- a/setupbase.py +++ b/setupbase.py @@ -153,7 +153,6 @@ def find_package_data(): pjoin(components, "underscore", "underscore-min.js"), pjoin(components, "moment", "moment.js"), pjoin(components, "moment", "min", "moment.min.js"), - pjoin(components, "term.js", "src", "term.js"), pjoin(components, "text-encoding", "lib", "encoding.js"), ])