From a3d1ec3d3f4562ae85f6992e647b5e2e5455d8bc Mon Sep 17 00:00:00 2001 From: gitdallas Date: Thu, 11 May 2023 12:49:03 -0500 Subject: [PATCH 1/7] chore(deps): update pf core dep --- packages/react-core/package.json | 2 +- packages/react-core/src/components/Chip/ChipGroup.tsx | 2 +- packages/react-docs/package.json | 2 +- packages/react-icons/package.json | 2 +- packages/react-styles/package.json | 2 +- packages/react-tokens/package.json | 2 +- yarn.lock | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 9acfa5e1763..2660807ddac 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -54,7 +54,7 @@ "tslib": "^2.5.0" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.46", + "@patternfly/patternfly": "5.0.0-alpha.50", "@rollup/plugin-commonjs": "^24.1.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-replace": "^5.0.2", diff --git a/packages/react-core/src/components/Chip/ChipGroup.tsx b/packages/react-core/src/components/Chip/ChipGroup.tsx index 242a45ce706..2d30dc40332 100644 --- a/packages/react-core/src/components/Chip/ChipGroup.tsx +++ b/packages/react-core/src/components/Chip/ChipGroup.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import styles from '@patternfly/react-styles/css/components/ChipGroup/chip-group'; +import styles from '@patternfly/react-styles/css/components/Chip/chip-group'; import { css } from '@patternfly/react-styles'; import { Button } from '../Button'; import { Chip } from './Chip'; diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index ae014eeedef..6928992a64b 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -23,7 +23,7 @@ "test:a11y": "patternfly-a11y --config patternfly-a11y.config" }, "dependencies": { - "@patternfly/patternfly": "5.0.0-alpha.46", + "@patternfly/patternfly": "5.0.0-alpha.50", "@patternfly/react-charts": "^7.0.0-alpha.24", "@patternfly/react-code-editor": "^5.0.0-alpha.97", "@patternfly/react-core": "^5.0.0-alpha.96", diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index a83aad074c1..64ee530bf29 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -32,7 +32,7 @@ "@fortawesome/free-brands-svg-icons": "^5.14.0", "@fortawesome/free-regular-svg-icons": "^5.14.0", "@fortawesome/free-solid-svg-icons": "^5.14.0", - "@patternfly/patternfly": "5.0.0-alpha.46", + "@patternfly/patternfly": "5.0.0-alpha.50", "fs-extra": "^11.1.1", "glob": "^7.1.2", "rimraf": "^2.6.2", diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index be697941aaa..e3d182f28a8 100644 --- a/packages/react-styles/package.json +++ b/packages/react-styles/package.json @@ -19,7 +19,7 @@ "clean": "rimraf dist css" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.46", + "@patternfly/patternfly": "5.0.0-alpha.50", "camel-case": "^3.0.0", "css": "^2.2.3", "fs-extra": "^11.1.1", diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json index 408a37ceaef..20c2c7f8eb1 100644 --- a/packages/react-tokens/package.json +++ b/packages/react-tokens/package.json @@ -29,7 +29,7 @@ "clean": "rimraf dist" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.46", + "@patternfly/patternfly": "5.0.0-alpha.50", "css": "^2.2.3", "fs-extra": "^11.1.1", "glob": "^7.1.2", diff --git a/yarn.lock b/yarn.lock index 2df6c71fa4c..b8367da3a23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4103,10 +4103,10 @@ puppeteer-cluster "^0.23.0" xmldoc "^1.1.2" -"@patternfly/patternfly@5.0.0-alpha.46": - version "5.0.0-alpha.46" - resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.46.tgz#08d4102019bf97e923067198d1032304db5a3c7c" - integrity sha512-170dUkmqQOeO7TAv/GT14fTMV1zKwe/vcCkP29XEGsmJT/WshCvcd6LjfZ4esFgckZMcc5G4IlHCRZRuA///OA== +"@patternfly/patternfly@5.0.0-alpha.50": + version "5.0.0-alpha.50" + resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.50.tgz#f4d898303f3b5e38c8042d8335b154690ee415ab" + integrity sha512-Ivcz1JpmdscnHxz3+hfKFrYEvNkYq+c7QBIGI+igdbqAEvZmM4mpJ4MQsrcjmjqhdxZN3i52Wc0/mA9SaZ9nbw== "@phenomnomnominal/tsquery@4.1.1": version "4.1.1" From 4c30f67bee72c61142200120d8cb072594c495b1 Mon Sep 17 00:00:00 2001 From: gitdallas Date: Thu, 11 May 2023 13:20:05 -0500 Subject: [PATCH 2/7] update snaps --- .../Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap | 2 +- .../Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap | 2 +- .../Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/react-core/src/components/Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap b/packages/react-core/src/components/Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap index bc145d4fd10..5b43aa692e6 100644 --- a/packages/react-core/src/components/Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap +++ b/packages/react-core/src/components/Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap @@ -103,7 +103,7 @@ exports[`Masthead verify insetMd inset breakpoints 1`] = ` exports[`Masthead verify insetNone inset breakpoints 1`] = `
test
diff --git a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap index b9ba9e31904..1060238fcc6 100644 --- a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap +++ b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap @@ -576,7 +576,7 @@ exports[`Pagination API verify insetMd inset breakpoints 1`] = ` exports[`Pagination API verify insetNone inset breakpoints 1`] = `
Date: Fri, 12 May 2023 08:00:21 -0500 Subject: [PATCH 3/7] update to latest pf core --- packages/react-core/package.json | 2 +- packages/react-docs/package.json | 2 +- packages/react-icons/package.json | 2 +- packages/react-styles/package.json | 2 +- packages/react-tokens/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 2660807ddac..6550f4b94f1 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -54,7 +54,7 @@ "tslib": "^2.5.0" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.50", + "@patternfly/patternfly": "5.0.0-alpha.53", "@rollup/plugin-commonjs": "^24.1.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-replace": "^5.0.2", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 6928992a64b..16ccf679a16 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -23,7 +23,7 @@ "test:a11y": "patternfly-a11y --config patternfly-a11y.config" }, "dependencies": { - "@patternfly/patternfly": "5.0.0-alpha.50", + "@patternfly/patternfly": "5.0.0-alpha.53", "@patternfly/react-charts": "^7.0.0-alpha.24", "@patternfly/react-code-editor": "^5.0.0-alpha.97", "@patternfly/react-core": "^5.0.0-alpha.96", diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index 64ee530bf29..478e8740547 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -32,7 +32,7 @@ "@fortawesome/free-brands-svg-icons": "^5.14.0", "@fortawesome/free-regular-svg-icons": "^5.14.0", "@fortawesome/free-solid-svg-icons": "^5.14.0", - "@patternfly/patternfly": "5.0.0-alpha.50", + "@patternfly/patternfly": "5.0.0-alpha.53", "fs-extra": "^11.1.1", "glob": "^7.1.2", "rimraf": "^2.6.2", diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index e3d182f28a8..15697d9ce30 100644 --- a/packages/react-styles/package.json +++ b/packages/react-styles/package.json @@ -19,7 +19,7 @@ "clean": "rimraf dist css" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.50", + "@patternfly/patternfly": "5.0.0-alpha.53", "camel-case": "^3.0.0", "css": "^2.2.3", "fs-extra": "^11.1.1", diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json index 20c2c7f8eb1..eb01b9c3d6e 100644 --- a/packages/react-tokens/package.json +++ b/packages/react-tokens/package.json @@ -29,7 +29,7 @@ "clean": "rimraf dist" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.50", + "@patternfly/patternfly": "5.0.0-alpha.53", "css": "^2.2.3", "fs-extra": "^11.1.1", "glob": "^7.1.2", diff --git a/yarn.lock b/yarn.lock index b8367da3a23..98880a32ea7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4103,10 +4103,10 @@ puppeteer-cluster "^0.23.0" xmldoc "^1.1.2" -"@patternfly/patternfly@5.0.0-alpha.50": - version "5.0.0-alpha.50" - resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.50.tgz#f4d898303f3b5e38c8042d8335b154690ee415ab" - integrity sha512-Ivcz1JpmdscnHxz3+hfKFrYEvNkYq+c7QBIGI+igdbqAEvZmM4mpJ4MQsrcjmjqhdxZN3i52Wc0/mA9SaZ9nbw== +"@patternfly/patternfly@5.0.0-alpha.53": + version "5.0.0-alpha.53" + resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.53.tgz#9eda25100680107c13793b98b6d4f56d947551fb" + integrity sha512-sy9lk98PLVGjFuJ6li9uIwKc/IXXhjv8Ow0Q/MDOCFrhnj2gWLjMr4uB4d0393mAGfD1vk8KkqF+7tfEDIBjpQ== "@phenomnomnominal/tsquery@4.1.1": version "4.1.1" From b6233fcc87aaceda33015124b0bc0b04994aaa42 Mon Sep 17 00:00:00 2001 From: gitdallas Date: Fri, 12 May 2023 09:45:10 -0500 Subject: [PATCH 4/7] fixes/bypass for errors after pf core update --- .../src/components/AboutModal/AboutModal.tsx | 16 ++++++++-------- .../BackgroundImage/BackgroundImage.tsx | 8 ++++---- .../__snapshots__/BackgroundImage.test.tsx.snap | 2 -- .../react-core/src/components/Label/Label.tsx | 2 +- .../src/components/Label/LabelGroup.tsx | 2 +- .../__snapshots__/LoginPage.test.tsx.snap | 1 - .../__snapshots__/Masthead.test.tsx.snap | 2 +- .../__snapshots__/Pagination.test.tsx.snap | 2 +- .../__snapshots__/Toolbar.test.tsx.snap | 2 +- .../scripts/icons/patternflyIcons.mjs | 2 +- 10 files changed, 18 insertions(+), 21 deletions(-) diff --git a/packages/react-core/src/components/AboutModal/AboutModal.tsx b/packages/react-core/src/components/AboutModal/AboutModal.tsx index f6e208d13ef..8b92a71e772 100644 --- a/packages/react-core/src/components/AboutModal/AboutModal.tsx +++ b/packages/react-core/src/components/AboutModal/AboutModal.tsx @@ -8,7 +8,7 @@ import { AboutModalBox } from './AboutModalBox'; import { Modal, ModalVariant } from '../Modal'; import { GenerateId } from '../../helpers/GenerateId/GenerateId'; // eslint-disable-next-line camelcase -import c_about_modal_box_BackgroundImage from '@patternfly/react-tokens/dist/esm/c_about_modal_box_BackgroundImage'; +// import c_about_modal_box_BackgroundImage from '@patternfly/react-tokens/dist/esm/c_about_modal_box_BackgroundImage'; export interface AboutModalProps extends React.HTMLProps { /** Content rendered inside the about modal */ @@ -89,13 +89,13 @@ export const AboutModal: React.FunctionComponent = ({ hasNoBodyWrapper > diff --git a/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx b/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx index 6cebe3f367a..804d955006f 100644 --- a/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx +++ b/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/BackgroundImage/background-image'; // eslint-disable-next-line camelcase -import c_background_image_BackgroundImage from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage'; +// import c_background_image_BackgroundImage from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage'; export interface BackgroundImageProps extends Omit, 'src'> { /** Additional classes added to the background image. */ @@ -19,9 +19,9 @@ export const BackgroundImage: React.FunctionComponent = ({
diff --git a/packages/react-core/src/components/BackgroundImage/__tests__/__snapshots__/BackgroundImage.test.tsx.snap b/packages/react-core/src/components/BackgroundImage/__tests__/__snapshots__/BackgroundImage.test.tsx.snap index 26ea5cad24d..fe676a7660d 100644 --- a/packages/react-core/src/components/BackgroundImage/__tests__/__snapshots__/BackgroundImage.test.tsx.snap +++ b/packages/react-core/src/components/BackgroundImage/__tests__/__snapshots__/BackgroundImage.test.tsx.snap @@ -4,7 +4,6 @@ exports[`BackgroundImage 1`] = `
`; @@ -13,7 +12,6 @@ exports[`allows passing in a single string as the image src 1`] = `
`; diff --git a/packages/react-core/src/components/Label/Label.tsx b/packages/react-core/src/components/Label/Label.tsx index 9cd2891103f..0eb2d7ecfb2 100644 --- a/packages/react-core/src/components/Label/Label.tsx +++ b/packages/react-core/src/components/Label/Label.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { useState } from 'react'; import styles from '@patternfly/react-styles/css/components/Label/label'; -import labelGrpStyles from '@patternfly/react-styles/css/components/LabelGroup/label-group'; +import labelGrpStyles from '@patternfly/react-styles/css/components/Label/label-group'; import { Button } from '../Button'; import { Tooltip, TooltipPosition } from '../Tooltip'; import { css } from '@patternfly/react-styles'; diff --git a/packages/react-core/src/components/Label/LabelGroup.tsx b/packages/react-core/src/components/Label/LabelGroup.tsx index 0583838e8a2..5ca4f2267b0 100644 --- a/packages/react-core/src/components/Label/LabelGroup.tsx +++ b/packages/react-core/src/components/Label/LabelGroup.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import styles from '@patternfly/react-styles/css/components/LabelGroup/label-group'; +import styles from '@patternfly/react-styles/css/components/Label/label-group'; import labelStyles from '@patternfly/react-styles/css/components/Label/label'; import { css } from '@patternfly/react-styles'; import { Button } from '../Button'; diff --git a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginPage.test.tsx.snap b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginPage.test.tsx.snap index 8e35e02296c..e6bdf1ddc4e 100644 --- a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginPage.test.tsx.snap +++ b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginPage.test.tsx.snap @@ -4,7 +4,6 @@ exports[`check loginpage example against snapshot 1`] = `