Skip to content

Commit 870af52

Browse files
committed
Fix failure of 'webpack --watch' with extracted chunks
This should fix the strange failure of 'webpack --watch' with the following message: Order in extracted chunk undefined There are upstream pull requests in webpack which work to fix this, but for now we just work around the issue. webpack-contrib/extract-text-webpack-plugin#166
1 parent 6db85b6 commit 870af52

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

pkg/docker/containers.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
var image_details = require("./image");
3333
var storage = require("./storage.jsx");
3434

35+
require("page.css");
36+
require("table.css");
37+
require("./docker.css");
38+
3539
var _ = cockpit.gettext;
3640
var C_ = cockpit.gettext;
3741

pkg/docker/details.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
var docker = require("./docker");
3030
var util = require("./util");
3131

32+
require("console.css");
3233

3334
var _ = cockpit.gettext;
3435
var C_ = cockpit.gettext;

pkg/docker/docker.css

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
@import "/page.css";
2-
3-
@import "/console.css";
4-
@import "/plot.css";
5-
@import "/table.css";
6-
71
/* For table rows containing interactive controls like bars */
82
.info-table-ct tr.interactive td {
93
line-height: 26px;

pkg/docker/overview.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
var bar = require("./bar");
3434
var view = require("./containers-view.jsx");
3535

36+
require("plot.css");
37+
3638
var _ = cockpit.gettext;
3739
var C_ = cockpit.gettext;
3840

pkg/networkmanager/interfaces.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ var journal = require('journal');
2727
/* jQuery extensions */
2828
require('patterns');
2929

30+
require("page.css");
31+
require("table.css");
32+
require("plot.css");
33+
require("journal.css");
34+
require("./networking.css");
35+
3036
var _ = cockpit.gettext;
3137
var C_ = cockpit.gettext;
3238

pkg/networkmanager/networking.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
@import url("/page.css");
2-
@import url("/table.css");
3-
@import url("/plot.css");
4-
@import url("/journal.css");
5-
61
.ipv4-address {
72
display: inline;
83
}

pkg/storaged/devices.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
var details = require("./details");
3030
var utils = require("./utils");
3131

32+
require("page.css");
33+
require("table.css");
34+
require("plot.css");
35+
require("journal.css");
36+
require("./storage.css");
37+
3238
var _ = cockpit.gettext;
3339
var C_ = cockpit.gettext;
3440

pkg/storaged/storage.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
* along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20-
@import url("/page.css");
21-
@import url("/table.css");
22-
@import url("/plot.css");
23-
@import url("/journal.css");
24-
2520
#storage {
2621
padding-left: 5px;
2722
padding-right: 5px;

webpack.config.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ var info = {
99
],
1010

1111
"docker/docker": [
12-
"docker/containers.js",
13-
"docker/docker.css",
12+
"docker/containers.js"
1413
],
1514
"docker/console": [
1615
"docker/console.js",
@@ -31,8 +30,7 @@ var info = {
3130
],
3231

3332
"networkmanager/network": [
34-
"networkmanager/interfaces.js",
35-
"networkmanager/networking.css",
33+
"networkmanager/interfaces.js"
3634
],
3735

3836
"ostree/ostree": [
@@ -88,8 +86,7 @@ var info = {
8886
],
8987

9088
"storaged/storage": [
91-
"storaged/devices.js",
92-
"storaged/storage.css",
89+
"storaged/devices.js"
9390
],
9491

9592
"subscriptions/subscriptions": [

0 commit comments

Comments
 (0)