diff --git a/bots/naughty/debian-stable/9641-xtermjs-dimensions-crash b/bots/naughty/debian-stable/9641-xtermjs-dimensions-crash deleted file mode 100644 index 5a2f524433b4..000000000000 --- a/bots/naughty/debian-stable/9641-xtermjs-dimensions-crash +++ /dev/null @@ -1,4 +0,0 @@ -Traceback (most recent call last): - File "test/verify/machineslib.py", line *, in testSerialConsole -* -RuntimeError: TypeError: Cannot read property 'dimensions' of undefined diff --git a/bots/naughty/debian-testing/9641-xtermjs-dimensions-crash b/bots/naughty/debian-testing/9641-xtermjs-dimensions-crash deleted file mode 100644 index 5a2f524433b4..000000000000 --- a/bots/naughty/debian-testing/9641-xtermjs-dimensions-crash +++ /dev/null @@ -1,4 +0,0 @@ -Traceback (most recent call last): - File "test/verify/machineslib.py", line *, in testSerialConsole -* -RuntimeError: TypeError: Cannot read property 'dimensions' of undefined diff --git a/bots/naughty/fedora-28/9641-xtermjs-dimensions-crash b/bots/naughty/fedora-28/9641-xtermjs-dimensions-crash deleted file mode 100644 index 5a2f524433b4..000000000000 --- a/bots/naughty/fedora-28/9641-xtermjs-dimensions-crash +++ /dev/null @@ -1,4 +0,0 @@ -Traceback (most recent call last): - File "test/verify/machineslib.py", line *, in testSerialConsole -* -RuntimeError: TypeError: Cannot read property 'dimensions' of undefined diff --git a/bots/naughty/fedora-29/9641-xtermjs-dimensions-crash b/bots/naughty/fedora-29/9641-xtermjs-dimensions-crash deleted file mode 100644 index 5a2f524433b4..000000000000 --- a/bots/naughty/fedora-29/9641-xtermjs-dimensions-crash +++ /dev/null @@ -1,4 +0,0 @@ -Traceback (most recent call last): - File "test/verify/machineslib.py", line *, in testSerialConsole -* -RuntimeError: TypeError: Cannot read property 'dimensions' of undefined diff --git a/bots/naughty/rhel-7/9641-xtermjs-dimensions-crash b/bots/naughty/rhel-7/9641-xtermjs-dimensions-crash deleted file mode 100644 index 5a2f524433b4..000000000000 --- a/bots/naughty/rhel-7/9641-xtermjs-dimensions-crash +++ /dev/null @@ -1,4 +0,0 @@ -Traceback (most recent call last): - File "test/verify/machineslib.py", line *, in testSerialConsole -* -RuntimeError: TypeError: Cannot read property 'dimensions' of undefined diff --git a/bots/naughty/rhel-x/9641-xtermjs-dimensions-crash b/bots/naughty/rhel-x/9641-xtermjs-dimensions-crash deleted file mode 100644 index 5a2f524433b4..000000000000 --- a/bots/naughty/rhel-x/9641-xtermjs-dimensions-crash +++ /dev/null @@ -1,4 +0,0 @@ -Traceback (most recent call last): - File "test/verify/machineslib.py", line *, in testSerialConsole -* -RuntimeError: TypeError: Cannot read property 'dimensions' of undefined diff --git a/bots/naughty/ubuntu-1604/9641-xtermjs-dimensions-crash b/bots/naughty/ubuntu-1604/9641-xtermjs-dimensions-crash deleted file mode 100644 index 5a2f524433b4..000000000000 --- a/bots/naughty/ubuntu-1604/9641-xtermjs-dimensions-crash +++ /dev/null @@ -1,4 +0,0 @@ -Traceback (most recent call last): - File "test/verify/machineslib.py", line *, in testSerialConsole -* -RuntimeError: TypeError: Cannot read property 'dimensions' of undefined diff --git a/bots/naughty/ubuntu-stable/9641-xtermjs-dimensions-crash b/bots/naughty/ubuntu-stable/9641-xtermjs-dimensions-crash deleted file mode 100644 index 5a2f524433b4..000000000000 --- a/bots/naughty/ubuntu-stable/9641-xtermjs-dimensions-crash +++ /dev/null @@ -1,4 +0,0 @@ -Traceback (most recent call last): - File "test/verify/machineslib.py", line *, in testSerialConsole -* -RuntimeError: TypeError: Cannot read property 'dimensions' of undefined diff --git a/bots/npm-update b/bots/npm-update index bb13a632e025..c4eb14900b08 100755 --- a/bots/npm-update +++ b/bots/npm-update @@ -34,8 +34,6 @@ FRAGILE = [ "patternfly", "paternfly-bootstrap-combobox", "requirejs", - # 1.4.x needs the full React 16, does not work with our react-lite 15 - "@patternfly/react-console", # version 0.32.2 switches to babel 7, which causes build failures with our babel 6 build system "react-bootstrap", ] diff --git a/package.json b/package.json index 0d8295538da7..631d12e81a9c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Cockpit isn't a Node package, these are devel time deps, not needed to build tarball either", "private": true, "dependencies": { - "@patternfly/react-console": "1.3.0", + "@patternfly/react-console": "1.4.2", "angular": "1.3.20", "angular-bootstrap-npm": "0.13.4", "angular-gettext": "2.3.11", diff --git a/webpack.config.js b/webpack.config.js index b8c427430cac..64d535dbb035 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -444,6 +444,11 @@ module.exports = { exclude: /\/node_modules\/.*\//, // exclude external dependencies loader: 'strict' // Adds "use strict" }, + /* these are called *.js, but are ES6 */ + { + test: /\/node_modules\/@novnc.*\.js$/, + loader: "babel-loader" + }, { test: /\.jsx$/, loader: "babel-loader"