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.

Sign up for GitHub

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

Jump to bottom

web: Update dependencies #1184

Merged
merged 11 commits into from
May 7, 2024
Merged

web: Update dependencies #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
69f1784
web: Update dependencies via `npm update`
dgdavid May 7, 2024
f182cbe
web: update @material-symbols/svg-400 to latest version
dgdavid May 7, 2024
c513f98
web: update `@typescript`` dependencies
dgdavid May 7, 2024
cad12f3
web: update webpack plugins
dgdavid May 7, 2024
2b534ae
web: update webpack-dev-server
dgdavid May 7, 2024
1f6cad8
web: update stylelint dependencies
dgdavid May 7, 2024
031f5d1
web: update css and sass loaders
dgdavid May 7, 2024
8ef71bd
web: update `@testing-library/react`
dgdavid May 7, 2024
13e0a99
web: drop no longer needed dependency override
dgdavid May 7, 2024
b21c560
web: update follow-redirects via `npm audit fix`
dgdavid May 7, 2024
6effbd2
web: ESLint fixes
dgdavid May 7, 2024
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
5,340 changes: 2,671 additions & 2,669 deletions web/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 16 additions & 17 deletions web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@
"@svgr/plugin-jsx": "^8.1.0",
"@svgr/webpack": "^8.1.0",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^14.1.0",
"@testing-library/react": "^15.0.7",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.5.8",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"ajv": "^8.12.0",
"babel-jest": "^29.7.0",
"babel-loader": "^9.1.3",
"compression-webpack-plugin": "^10.0.0",
"copy-webpack-plugin": "^11.0.0",
"compression-webpack-plugin": "^11.1.0",
"copy-webpack-plugin": "^12.0.2",
"cspell": "^8.0.0",
"css-loader": "^6.5.0",
"css-minimizer-webpack-plugin": "^5.0.0",
"css-loader": "^7.1.1",
"css-minimizer-webpack-plugin": "^6.0.0",
"eslint": "^8.53.0",
"eslint-config-standard": "^17.1.0",
"eslint-config-standard-jsx": "^11.0.0",
Expand All @@ -66,7 +66,7 @@
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-webpack-plugin": "^4.0.1",
"html-minimizer-webpack-plugin": "^4.4.0",
"html-minimizer-webpack-plugin": "^5.0.0",
"htmlparser": "^1.7.7",
"identity-obj-proxy": "^3.0.0",
"jed": "^1.1.1",
Expand All @@ -79,12 +79,12 @@
"qunit": "^2.20.0",
"react-refresh": "^0.14.0",
"sass": "^1.69.5",
"sass-loader": "^13.3.2",
"sass-loader": "^14.2.1",
"string-replace-loader": "^3.0.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-config-standard-scss": "^11.1.0",
"stylelint-webpack-plugin": "^4.1.1",
"stylelint": "^16.5.0",
"stylelint-config-standard": "^36.0.0",
"stylelint-config-standard-scss": "^13.1.0",
"stylelint-webpack-plugin": "^5.0.0",
"terser-webpack-plugin": "^5.3.9",
"ts-jest": "^29.0.3",
"tsconfig-paths-webpack-plugin": "^4.0.0",
Expand All @@ -95,11 +95,11 @@
"typescript": "^5.3.3",
"webpack": "^5.89.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
"webpack-dev-server": "^5.0.4"
},
"dependencies": {
"@icons-pack/react-simple-icons": "^9.1.0",
"@material-symbols/svg-400": "^0.14.0",
"@material-symbols/svg-400": "^0.17.4",
"@patternfly/patternfly": "^5.1.0",
"@patternfly/react-core": "^5.1.1",
"@patternfly/react-table": "^5.1.1",
Expand All @@ -112,7 +112,6 @@
"xbytes": "^1.8.0"
},
"overrides": {
"jsdom": "^22.1.0",
"follow-redirects": "1.15.4"
"jsdom": "^22.1.0"
}
}
60 changes: 29 additions & 31 deletions web/src/client/network.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,48 +25,47 @@ import { HTTPClient } from "./http";
import { NetworkClient } from "./network";
const ADDRESS = "http://localhost";


const mockWiredConnection = {
"id": "eth0",
"status": "up",
"interface": "eth0",
"method4": "manual",
"method6": "manual",
"addresses": ["192.168.122.100/24"],
"nameservers": ["192.168.122.1"],
"gateway4": "192.168.122.1"
}
id: "eth0",
status: "up",
interface: "eth0",
method4: "manual",
method6: "manual",
addresses: ["192.168.122.100/24"],
nameservers: ["192.168.122.1"],
gateway4: "192.168.122.1"
};

const mockWirelessConnection = {
"id": "AgamaNetwork",
"method4": "auto",
"method6": "auto",
"wireless": {
"passworkd": "agama.test",
"security": "wpa-psk",
"ssid": "Agama",
"mode": "infrastructure"
id: "AgamaNetwork",
method4: "auto",
method6: "auto",
wireless: {
passworkd: "agama.test",
security: "wpa-psk",
ssid: "Agama",
mode: "infrastructure"
},
"status": "down"
}
status: "down"
};

const mockConnection = {
"id": "eth0",
"status": "up",
"interface": "eth0",
"method4": "manual",
"method6": "manual",
"addresses": [{ address: "192.168.122.100", prefix: 24 }],
"nameservers": ["192.168.122.1"],
"gateway4": "192.168.122.1"
}
id: "eth0",
status: "up",
interface: "eth0",
method4: "manual",
method6: "manual",
addresses: [{ address: "192.168.122.100", prefix: 24 }],
nameservers: ["192.168.122.1"],
gateway4: "192.168.122.1"
};

const mockSettings = {
hostname: "localhost.localdomain",
connectivity: true,
wireless_enabled: true,
networking_enabled: true
}
};

const mockJsonFn = jest.fn();

Expand Down Expand Up @@ -109,7 +108,6 @@ describe("NetworkClient", () => {
});
});


describe("#settings", () => {
it("returns network general settings", async () => {
const http = new HTTPClient(new URL(ADDRESS));
Expand Down
44 changes: 22 additions & 22 deletions web/src/components/network/NetworkPage.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,31 @@ jest.mock("~/client");
jest.mock("~/components/core/Sidebar", () => () => <div>Agama sidebar</div>);

const wiredConnection = {
"id": "eth0",
"status": "up",
"iface": "eth0",
"method4": "manual",
"method6": "manual",
"addresses": [{ address: "192.168.122.20", prefix: 24 }],
"nameservers": ["192.168.122.1"],
"gateway4": "192.168.122.1"
}
id: "eth0",
status: "up",
iface: "eth0",
method4: "manual",
method6: "manual",
addresses: [{ address: "192.168.122.20", prefix: 24 }],
nameservers: ["192.168.122.1"],
gateway4: "192.168.122.1"
};

const wiFiConnection = {
"id": "AgamaNetwork",
"iface": "wlan0",
"method4": "auto",
"method6": "auto",
"wireless": {
"passworkd": "agama.test",
"security": "wpa-psk",
"ssid": "Agama",
"mode": "infrastructure"
id: "AgamaNetwork",
iface: "wlan0",
method4: "auto",
method6: "auto",
wireless: {
passworkd: "agama.test",
security: "wpa-psk",
ssid: "Agama",
mode: "infrastructure"
},
"addresses": [{ address: "192.168.69.200", prefix: 24 }],
"nameservers": [],
"status": "up"
}
addresses: [{ address: "192.168.69.200", prefix: 24 }],
nameservers: [],
status: "up"
};

const ethernetDevice = {
name: "eth0",
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/network/WifiNetworkListItem.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import { screen } from "@testing-library/react";
import { installerRender } from "~/test-utils";

import { WifiNetworkListItem } from "~/components/network";
import { createClient } from "~/client";

jest.mock("~/components/network/WifiConnectionForm", () => () => <div>WifiConnectionForm mock</div>);
jest.mock("~/components/network/WifiNetworkMenu", () => () => <div>WifiNetworkMenu mock</div>);
import { createClient } from "~/client";

jest.mock("~/client");
const onSelectCallback = jest.fn();
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/overview/NetworkSection.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ beforeEach(() => {
onNetworkChange: onNetworkChangeEventFn,
fromApiDevice: fromApiDeviceFn
}
}
};
});
});

Expand Down
12 changes: 6 additions & 6 deletions web/src/components/overview/SoftwareSection.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ import { SoftwareSection } from "~/components/overview";
jest.mock("~/client");

const kdePattern = {
"name": "kde",
"category": "Graphical Environments",
"icon": "./pattern-kde",
"description": "Packages providing the Plasma desktop environment and applications from KDE.",
"summary": "KDE Applications and Plasma Desktop",
"order": "1110",
name: "kde",
category: "Graphical Environments",
icon: "./pattern-kde",
description: "Packages providing the Plasma desktop environment and applications from KDE.",
summary: "KDE Applications and Plasma Desktop",
order: "1110",
};

let getStatusFn = jest.fn().mockResolvedValue(IDLE);
Expand Down
12 changes: 7 additions & 5 deletions web/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ module.exports = {
hot: true,
// additionally watch these files for changes
watchFiles: ["./src/manifest.json", "./po/*.po"],
proxy: {
proxy: [
// TODO: modify it to not depend on cockpit
// forward the manifests.js request and patch the response with the
// current Agama manifest from the ./src/manifest.json file
Expand All @@ -108,16 +108,18 @@ module.exports = {
// selfHandleResponse : true,
// onProxyRes: manifests_handler,
// },
"/api/ws": {
{
context: ["/api/ws"],
target: agamaServer.replace(/^http/, "ws"),
ws: true,
secure: false,
},
"/api": {
{
context: ["/api"],
target: agamaServer,
secure: false,
},
},
}
],
server: "http",
// hot replacement does not support wss:// transport when running over https://,
// as a workaround use sockjs (which uses standard https:// protocol)
Expand Down
Loading