From 81a3650ebac5f0110d3bc4029d6deb982c63571c Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Thu, 4 May 2023 02:24:40 +0000 Subject: [PATCH] Makefile: Update Cockpit lib to 947f1753867e3924b9617aaace936225 Update to PF5 and the new cockpit lib API. Closes #646 (cherry picked from commit b2bdaac5b25d8f44f27675e956c681a4b84c6b3c) --- Makefile | 2 +- package.json | 4 ++-- src/index.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 24d5fd3..4d9a7fe 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ COCKPIT_REPO_FILES = \ $(NULL) COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git -COCKPIT_REPO_COMMIT = 269bf89276c679a03befc8a04244addd5d810048 # 290 + 42 commits +COCKPIT_REPO_COMMIT = 947f1753867e3924b9617aaace936225fd6022e7 # 291 + 2 commits $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP) COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}' diff --git a/package.json b/package.json index 3f3f0ec..4c8e3a1 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "stylelint-formatter-pretty": "^3.2.0" }, "dependencies": { - "@patternfly/patternfly": "4.224.4", - "@patternfly/react-core": "4.276.9", + "@patternfly/patternfly": "5.0.0-alpha.40", + "@patternfly/react-core": "5.0.0-alpha.72", "@patternfly/react-table": "^4.113.0", "buffer": "^6.0.3", "comment-json": "^4.2.3", diff --git a/src/index.js b/src/index.js index ff46bb7..08c3bbd 100644 --- a/src/index.js +++ b/src/index.js @@ -18,7 +18,7 @@ */ import "cockpit-dark-theme"; -import "patternfly/patternfly-4-cockpit.scss"; +import "patternfly/patternfly-5-cockpit.scss"; import React from 'react'; import { createRoot } from 'react-dom/client'; @@ -30,7 +30,7 @@ import { Application } from './app.jsx'; * out of the dist/index.js and since it will maintain the order of the imported CSS, * the overrides will be correctly in the end of our stylesheet. */ -import "patternfly/patternfly-4-overrides.scss"; +import "patternfly/patternfly-5-overrides.scss"; import './app.scss'; document.addEventListener("DOMContentLoaded", function () {