From 92241ef807ad6fe299f1281395b03c9c0df19ec0 Mon Sep 17 00:00:00 2001 From: Austin Sullivan Date: Thu, 30 Nov 2023 13:43:14 -0500 Subject: [PATCH 01/11] chore(deps): update patternfly deps to v6 alphas --- package-lock.json | 90 ++++++++++++++++----------------- package.json | 6 +-- src/app/AppLayout/AppLayout.tsx | 2 +- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index d64d08b3..19c77892 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,9 @@ "version": "0.0.2", "license": "MIT", "dependencies": { - "@patternfly/react-core": "^5.0.0", - "@patternfly/react-icons": "^5.0.0", - "@patternfly/react-styles": "^5.0.0", + "@patternfly/react-core": "6.0.0-alpha.2", + "@patternfly/react-icons": "6.0.0-alpha.2", + "@patternfly/react-styles": "6.0.0-alpha.2", "@storybook/builder-webpack5": "^7.0.27", "react": "^18", "react-dom": "^18", @@ -2245,14 +2245,14 @@ } }, "node_modules/@patternfly/react-core": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0.tgz", - "integrity": "sha512-kewRVFhLw0Dvt8250pqrO47sVRx8E93sMGZbHQomJnZdachYeQ9STnQTP2gvOBq/GPnMei0LZLv0T99g8mPE4w==", - "dependencies": { - "@patternfly/react-icons": "^5.0.0", - "@patternfly/react-styles": "^5.0.0", - "@patternfly/react-tokens": "^5.0.0", - "focus-trap": "7.4.3", + "version": "6.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-6.0.0-alpha.2.tgz", + "integrity": "sha512-1AnOI3ZmjBtAh97+aDNCmEgE/7LvUGu3MB3BYJkYFWXz8CIKCrurc3k3e3gCAVdg0oNXhcoSpUsjXnS4/e7qkA==", + "dependencies": { + "@patternfly/react-icons": "^6.0.0-alpha.2", + "@patternfly/react-styles": "^6.0.0-alpha.2", + "@patternfly/react-tokens": "^6.0.0-alpha.2", + "focus-trap": "7.5.2", "react-dropzone": "^14.2.3", "tslib": "^2.5.0" }, @@ -2262,23 +2262,23 @@ } }, "node_modules/@patternfly/react-icons": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.0.0.tgz", - "integrity": "sha512-GG5Y/UYl0h346MyDU9U650Csaq4Mxk8S6U8XC7ERk/xIrRr2RF67O2uY7zKBDMTNLYdBvPzgc2s3OMV1+d2/mg==", + "version": "6.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-alpha.2.tgz", + "integrity": "sha512-OGBen2niZ5S88rY2DVeO+P06oaZP5cO5MmdgW7iOzhVuyHkUS+IB15bN7+RxO9PJkEpfMQz0Ui/rQaXFGxLaSw==", "peerDependencies": { "react": "^17 || ^18", "react-dom": "^17 || ^18" } }, "node_modules/@patternfly/react-styles": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.0.0.tgz", - "integrity": "sha512-xbSCgjx+fPrXbIzUznwTFWtJEbzVS0Wn4zrejdKJYQTY+4YcuPlFkeq2tl3syzwGsaYMpHiFwQiTaKyTvlwtuw==" + "version": "6.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-6.0.0-alpha.2.tgz", + "integrity": "sha512-39VT5sKQdxck48mjSgbiL9gn6SaaVuYrlqQcrkpRB4F7qk0rJdVAdjwS/PliRjsb/Ywz7xG9UWK/D/1OoQEf2A==" }, "node_modules/@patternfly/react-tokens": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-5.0.0.tgz", - "integrity": "sha512-to2CXIZ6WTuzBcjLZ+nXi5LhnYkSIDu3RBMRZwrplmECOoUWv87CC+2T0EVxtASRtpQfikjD2PDKMsif5i0BxQ==" + "version": "6.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-6.0.0-alpha.2.tgz", + "integrity": "sha512-A4CN2WLUzjpHD2WAOexYG9X+yy5fowZXmUpLX87+Gk+sl5ziYOFY661l6b+ZgWmvNZ+g58K75JKb8Myu3bx7Ow==" }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", @@ -10666,11 +10666,11 @@ } }, "node_modules/focus-trap": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.3.tgz", - "integrity": "sha512-BgSSbK4GPnS2VbtZ50VtOv1Sti6DIkj3+LkVjiWMNjLeAp1SH1UlLx3ULu/DCu4vq5R4/uvTm+zrvsMsuYmGLg==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.2.tgz", + "integrity": "sha512-p6vGNNWLDGwJCiEjkSK6oERj/hEyI9ITsSwIUICBoKLlWiTWXJRfQibCwcoi50rTZdbi87qDtUlMCmQwsGSgPw==", "dependencies": { - "tabbable": "^6.1.2" + "tabbable": "^6.2.0" } }, "node_modules/follow-redirects": { @@ -23574,33 +23574,33 @@ } }, "@patternfly/react-core": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0.tgz", - "integrity": "sha512-kewRVFhLw0Dvt8250pqrO47sVRx8E93sMGZbHQomJnZdachYeQ9STnQTP2gvOBq/GPnMei0LZLv0T99g8mPE4w==", - "requires": { - "@patternfly/react-icons": "^5.0.0", - "@patternfly/react-styles": "^5.0.0", - "@patternfly/react-tokens": "^5.0.0", - "focus-trap": "7.4.3", + "version": "6.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-6.0.0-alpha.2.tgz", + "integrity": "sha512-1AnOI3ZmjBtAh97+aDNCmEgE/7LvUGu3MB3BYJkYFWXz8CIKCrurc3k3e3gCAVdg0oNXhcoSpUsjXnS4/e7qkA==", + "requires": { + "@patternfly/react-icons": "^6.0.0-alpha.2", + "@patternfly/react-styles": "^6.0.0-alpha.2", + "@patternfly/react-tokens": "^6.0.0-alpha.2", + "focus-trap": "7.5.2", "react-dropzone": "^14.2.3", "tslib": "^2.5.0" } }, "@patternfly/react-icons": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.0.0.tgz", - "integrity": "sha512-GG5Y/UYl0h346MyDU9U650Csaq4Mxk8S6U8XC7ERk/xIrRr2RF67O2uY7zKBDMTNLYdBvPzgc2s3OMV1+d2/mg==", + "version": "6.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-alpha.2.tgz", + "integrity": "sha512-OGBen2niZ5S88rY2DVeO+P06oaZP5cO5MmdgW7iOzhVuyHkUS+IB15bN7+RxO9PJkEpfMQz0Ui/rQaXFGxLaSw==", "requires": {} }, "@patternfly/react-styles": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.0.0.tgz", - "integrity": "sha512-xbSCgjx+fPrXbIzUznwTFWtJEbzVS0Wn4zrejdKJYQTY+4YcuPlFkeq2tl3syzwGsaYMpHiFwQiTaKyTvlwtuw==" + "version": "6.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-6.0.0-alpha.2.tgz", + "integrity": "sha512-39VT5sKQdxck48mjSgbiL9gn6SaaVuYrlqQcrkpRB4F7qk0rJdVAdjwS/PliRjsb/Ywz7xG9UWK/D/1OoQEf2A==" }, "@patternfly/react-tokens": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-5.0.0.tgz", - "integrity": "sha512-to2CXIZ6WTuzBcjLZ+nXi5LhnYkSIDu3RBMRZwrplmECOoUWv87CC+2T0EVxtASRtpQfikjD2PDKMsif5i0BxQ==" + "version": "6.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-6.0.0-alpha.2.tgz", + "integrity": "sha512-A4CN2WLUzjpHD2WAOexYG9X+yy5fowZXmUpLX87+Gk+sl5ziYOFY661l6b+ZgWmvNZ+g58K75JKb8Myu3bx7Ow==" }, "@pkgjs/parseargs": { "version": "0.11.0", @@ -30179,11 +30179,11 @@ } }, "focus-trap": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.3.tgz", - "integrity": "sha512-BgSSbK4GPnS2VbtZ50VtOv1Sti6DIkj3+LkVjiWMNjLeAp1SH1UlLx3ULu/DCu4vq5R4/uvTm+zrvsMsuYmGLg==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.2.tgz", + "integrity": "sha512-p6vGNNWLDGwJCiEjkSK6oERj/hEyI9ITsSwIUICBoKLlWiTWXJRfQibCwcoi50rTZdbi87qDtUlMCmQwsGSgPw==", "requires": { - "tabbable": "^6.1.2" + "tabbable": "^6.2.0" } }, "follow-redirects": { diff --git a/package.json b/package.json index f1f4b267..f03f8847 100644 --- a/package.json +++ b/package.json @@ -79,9 +79,9 @@ "webpack-merge": "^5.9.0" }, "dependencies": { - "@patternfly/react-core": "^5.0.0", - "@patternfly/react-icons": "^5.0.0", - "@patternfly/react-styles": "^5.0.0", + "@patternfly/react-core": "6.0.0-alpha.2", + "@patternfly/react-icons": "6.0.0-alpha.2", + "@patternfly/react-styles": "6.0.0-alpha.2", "@storybook/builder-webpack5": "^7.0.27", "react": "^18", "react-dom": "^18", diff --git a/src/app/AppLayout/AppLayout.tsx b/src/app/AppLayout/AppLayout.tsx index 8fb9c861..b88f5c72 100644 --- a/src/app/AppLayout/AppLayout.tsx +++ b/src/app/AppLayout/AppLayout.tsx @@ -73,7 +73,7 @@ const AppLayout: React.FunctionComponent = ({ children }) => { ); const Sidebar = ( - + {Navigation} From dac387064f35147050f1d8f03b51bdb596eaa4f4 Mon Sep 17 00:00:00 2001 From: Austin Sullivan Date: Thu, 30 Nov 2023 16:08:52 -0500 Subject: [PATCH 02/11] chore(nav): change nav theme to light --- src/app/AppLayout/AppLayout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/AppLayout/AppLayout.tsx b/src/app/AppLayout/AppLayout.tsx index b88f5c72..a955125e 100644 --- a/src/app/AppLayout/AppLayout.tsx +++ b/src/app/AppLayout/AppLayout.tsx @@ -63,7 +63,7 @@ const AppLayout: React.FunctionComponent = ({ children }) => { ); const Navigation = ( -