Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failure of 'webpack --watch' with extracted chunks #5288

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/docker/containers.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
var image_details = require("./image");
var storage = require("./storage.jsx");

require("page.css");
require("table.css");
require("./docker.css");

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

Expand Down
1 change: 1 addition & 0 deletions pkg/docker/details.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
var docker = require("./docker");
var util = require("./util");

require("console.css");

var _ = cockpit.gettext;
var C_ = cockpit.gettext;
Expand Down
6 changes: 0 additions & 6 deletions pkg/docker/docker.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
@import "/page.css";

@import "/console.css";
@import "/plot.css";
@import "/table.css";

/* For table rows containing interactive controls like bars */
.info-table-ct tr.interactive td {
line-height: 26px;
Expand Down
2 changes: 2 additions & 0 deletions pkg/docker/overview.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
var bar = require("./bar");
var view = require("./containers-view.jsx");

require("plot.css");

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

Expand Down
6 changes: 6 additions & 0 deletions pkg/networkmanager/interfaces.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ var journal = require('journal');
/* jQuery extensions */
require('patterns');

require("page.css");
require("table.css");
require("plot.css");
require("journal.css");
require("./networking.css");

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

Expand Down
5 changes: 0 additions & 5 deletions pkg/networkmanager/networking.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
@import url("/page.css");
@import url("/table.css");
@import url("/plot.css");
@import url("/journal.css");

.ipv4-address {
display: inline;
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/storaged/devices.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
var details = require("./details");
var utils = require("./utils");

require("page.css");
require("table.css");
require("plot.css");
require("journal.css");
require("./storage.css");

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

Expand Down
5 changes: 0 additions & 5 deletions pkg/storaged/storage.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
* along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
*/

@import url("/page.css");
@import url("/table.css");
@import url("/plot.css");
@import url("/journal.css");

#storage {
padding-left: 5px;
padding-right: 5px;
Expand Down
9 changes: 3 additions & 6 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ var info = {
],

"docker/docker": [
"docker/containers.js",
"docker/docker.css",
"docker/containers.js"
],
"docker/console": [
"docker/console.js",
Expand All @@ -31,8 +30,7 @@ var info = {
],

"networkmanager/network": [
"networkmanager/interfaces.js",
"networkmanager/networking.css",
"networkmanager/interfaces.js"
],

"ostree/ostree": [
Expand Down Expand Up @@ -88,8 +86,7 @@ var info = {
],

"storaged/storage": [
"storaged/devices.js",
"storaged/storage.css",
"storaged/devices.js"
],

"subscriptions/subscriptions": [
Expand Down