Skip to content

Commit

Permalink
package.json: Update to latest PatternFly react-console
Browse files Browse the repository at this point in the history
This fixes the pesky crash at last.

This pulls in @novnc/novnc, which uses ES6 syntax in its *.js files.
This leads to runtime errors like

    SyntaxError: export declarations may only appear at top level of a module

as these are embedded in webpacks. Until we update to a less ancient
weback, fix these by applying babel on the novnc sources.
  • Loading branch information
martinpitt committed Sep 23, 2018
1 parent 364b8ae commit ccb6c5c
Show file tree
Hide file tree
Showing 11 changed files with 6 additions and 35 deletions.
4 changes: 0 additions & 4 deletions bots/naughty/debian-stable/9641-xtermjs-dimensions-crash

This file was deleted.

4 changes: 0 additions & 4 deletions bots/naughty/debian-testing/9641-xtermjs-dimensions-crash

This file was deleted.

4 changes: 0 additions & 4 deletions bots/naughty/fedora-28/9641-xtermjs-dimensions-crash

This file was deleted.

4 changes: 0 additions & 4 deletions bots/naughty/fedora-29/9641-xtermjs-dimensions-crash

This file was deleted.

4 changes: 0 additions & 4 deletions bots/naughty/rhel-7/9641-xtermjs-dimensions-crash

This file was deleted.

4 changes: 0 additions & 4 deletions bots/naughty/rhel-x/9641-xtermjs-dimensions-crash

This file was deleted.

4 changes: 0 additions & 4 deletions bots/naughty/ubuntu-1604/9641-xtermjs-dimensions-crash

This file was deleted.

4 changes: 0 additions & 4 deletions bots/naughty/ubuntu-stable/9641-xtermjs-dimensions-crash

This file was deleted.

2 changes: 0 additions & 2 deletions bots/npm-update
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit ccb6c5c

Please sign in to comment.