package.json: Update @patternfly/patternfly, @patternfly/react-core, @patternfly/react-icons, @patternfly/react-styles, @patternfly/react-table, @patternfly/react-tokens

Remove solved overrides. Also update usage of RedHat font [1].

[1] patternfly/patternfly#5503

files.js

@@ -145,19 +145,17 @@ const nodedir = path.relative(process.cwd(), path.resolve(srcdir, "node_modules"
 export const all_subdirs = Array.from(new Set(info.entries.map(key => key.split('/')[0])));
 
 const redhat_fonts = [
-    "Text-updated-Bold", "Text-updated-BoldItalic", "Text-updated-Italic", "Text-updated-Medium", "Text-updated-MediumItalic", "Text-updated-Regular",
-    "Display-updated-Black", "Display-updated-BlackItalic", "Display-updated-Bold", "Display-updated-BoldItalic",
-    "Display-updated-Italic", "Display-updated-Medium", "Display-updated-MediumItalic", "Display-updated-Regular",
-    "Mono-updated-Bold", "Mono-updated-BoldItalic", "Mono-updated-Italic", "Mono-updated-Medium", "Mono-updated-MediumItalic", "Mono-updated-Regular",
+    "Text-Bold", "Text-BoldItalic", "Text-Italic", "Text-Medium", "Text-MediumItalic", "Text-Regular",
+    "Display-Black", "Display-BlackItalic", "Display-Bold", "Display-BoldItalic",
+    "Display-Italic", "Display-Medium", "Display-MediumItalic", "Display-Regular",
+    "Mono-Bold", "Mono-BoldItalic", "Mono-Italic", "Mono-Medium", "Mono-MediumItalic", "Mono-Regular",
 ].map(name => {
     const subdir = 'RedHat' + name.split('-')[0];
-    const fontsdir = '@patternfly/patternfly/assets/fonts/RedHatFont-updated';
+    const fontsdir = '@patternfly/patternfly/assets/fonts';
 
     return {
-        // Rename the RedHat*-updated files to not contain the 'updated' string so as to keep compatibility with external plugins
-        // which expect the non-updated font file names in `static` folder
         from: path.resolve(nodedir, fontsdir, subdir, 'RedHat' + name + '.woff2'),
-        to: 'static/fonts/RedHat' + name.replace("-updated", "") + ".woff2"
+        to: 'static/fonts/'
     };
 });
 

node_modules

@@ -1 +1 @@
-Subproject commit 055682f225d2d87e010674adb0852002c9d32bec
+Subproject commit 82cb7857f0597330b324c85dfce21bbdc1242138

package.json

@@ -4,12 +4,12 @@
   "type": "module",
   "private": true,
   "dependencies": {
-    "@patternfly/patternfly": "5.0.0-alpha.53",
-    "@patternfly/react-core": "5.0.0-alpha.98",
-    "@patternfly/react-icons": "5.0.0-alpha.14",
-    "@patternfly/react-styles": "5.0.0-alpha.10",
-    "@patternfly/react-table": "5.0.0-alpha.100",
-    "@patternfly/react-tokens": "5.0.0-alpha.9",
+    "@patternfly/patternfly": "5.0.0-prerelease.8",
+    "@patternfly/react-core": "5.0.0-alpha.132",
+    "@patternfly/react-icons": "5.0.0-alpha.21",
+    "@patternfly/react-styles": "5.0.0-alpha.19",
+    "@patternfly/react-table": "5.0.0-alpha.136",
+    "@patternfly/react-tokens": "5.0.0-alpha.16",
     "deep-equal": "2.0.5",
     "js-sha1": "0.6.0",
     "js-sha256": "0.9.0",

pkg/lib/patternfly/patternfly-5-overrides.scss

@@ -2,31 +2,12 @@
 // Pull in variables (for breakpoints)
 @use "global-variables" as *;
 
-// https://github.com/patternfly/patternfly-react/pull/8953
-.pf-v5-c-input-group__text {
-  padding-inline: var(--pf-v5-global--spacer--sm);
-}
-
 // PF Select is deprecated - no issue reported upstream - this needs to be removed from our codebase
 // Make select have the expected width
 .pf-v5-c-select[data-popper-reference-hidden="false"] {
   inline-size: auto;
 }
 
-// https://github.com/patternfly/patternfly/issues/5501
-.pf-v5-theme-dark {
-  .pf-v5-c-alert.pf-m-custom {
-    --pf-v5-c-alert--BackgroundColor: var(--pf-v5-global--palette--black-600);
-    --pf-v5-c-alert__title--Color: var(--pf-v5-global--custom-color--200);
-  }
-}
-
-// https://github.com/patternfly/patternfly-react/issues/8993
-.pf-v5-c-about-modal-box__close {
-  --pf-v5-c-about-modal-box__close--c-button--BackgroundColor: var(--pf-v5-global--BackgroundColor--dark-200);
-  --pf-v5-c-about-modal-box__close--c-button--hover--BackgroundColor: var(--pf-v5-global--BackgroundColor--dark-400);
-}
-
 /* WORKAROUND: Navigation problems with Tertiary Nav widget on mobile */
 /* See: https://github.com/patternfly/patternfly-design/issues/840 */
 /* Helper mod to wrap pf-v5-c-nav__tertiary */

pkg/systemd/overview-cards/motdCard.jsx

@@ -116,8 +116,8 @@ export const MotdCard = () => {
         <AlertActionCloseButton onClose={hideAlert} />
     </>;
 
-    // Switch to variant="custom" when https://github.com/patternfly/patternfly-react/pull/8974 is released
-    return <Alert id="motd-box" isInline className="pf-m-custom motd-box"
+    return <Alert id="motd-box" isInline className="motd-box"
+                  variant="custom"
                   title={<pre id="motd">{motdText}</pre>}
                   actionClose={actionClose} />;
 };