From 29a4a16cd4d2595a54376df6e455271be4aa8ac8 Mon Sep 17 00:00:00 2001 From: Rebecca Alpert Date: Thu, 19 Sep 2024 17:20:27 -0400 Subject: [PATCH] chore(docs): bump to latest versions --- package-lock.json | 63 ++--- package.json | 6 +- src/app/AppLayout/AppLayout.tsx | 118 +++++---- src/app/Dashboard/Dashboard.tsx | 2 +- src/app/NotFound/NotFound.tsx | 2 +- src/app/Settings/General/GeneralSettings.tsx | 2 +- src/app/Settings/Profile/ProfileSettings.tsx | 2 +- src/app/Support/Support.tsx | 45 ++-- src/app/__snapshots__/app.test.tsx.snap | 248 ++++++++++--------- 9 files changed, 260 insertions(+), 228 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0fb55eb3..37b298b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,9 @@ "version": "0.0.2", "license": "MIT", "dependencies": { - "@patternfly/react-core": "6.0.0-alpha.83", - "@patternfly/react-icons": "6.0.0-alpha.30", - "@patternfly/react-styles": "6.0.0-alpha.29", + "@patternfly/react-core": "6.0.0-prerelease.13", + "@patternfly/react-icons": "6.0.0-prerelease.4", + "@patternfly/react-styles": "6.0.0-prerelease.3", "react": "^18", "react-dom": "^18", "sirv-cli": "^2.0.2" @@ -1723,16 +1723,17 @@ } }, "node_modules/@patternfly/react-core": { - "version": "6.0.0-alpha.83", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-6.0.0-alpha.83.tgz", - "integrity": "sha512-rGMHa2OGAS2ileu1KO4Lq970XQF8Pyw6iIUwvIcFsdktdbM3nIqW/SgNKZ3d6VOP+fV0R4iZ5b6Sj0QMvHzOzQ==", - "dependencies": { - "@patternfly/react-icons": "^6.0.0-alpha.30", - "@patternfly/react-styles": "^6.0.0-alpha.29", - "@patternfly/react-tokens": "^6.0.0-alpha.29", - "focus-trap": "7.5.4", + "version": "6.0.0-prerelease.13", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-6.0.0-prerelease.13.tgz", + "integrity": "sha512-jvfOL+uTwL+47RXWe2PqeeWEAWvKsTqbu1RUiRrfwCZ5My/BCcuSACsNY+5yvebNAVg6xlHxOcfO71ouw4GtrQ==", + "license": "MIT", + "dependencies": { + "@patternfly/react-icons": "^6.0.0-prerelease.4", + "@patternfly/react-styles": "^6.0.0-prerelease.3", + "@patternfly/react-tokens": "^6.0.0-prerelease.4", + "focus-trap": "7.6.0", "react-dropzone": "^14.2.3", - "tslib": "^2.6.2" + "tslib": "^2.7.0" }, "peerDependencies": { "react": "^17 || ^18", @@ -1740,23 +1741,26 @@ } }, "node_modules/@patternfly/react-icons": { - "version": "6.0.0-alpha.30", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-alpha.30.tgz", - "integrity": "sha512-w9ct8Rf9a0IURq/GO9jXLEr5528DKpKvy35Ys00NXI/V0j48LAiAwu8AFCvWq9zXnLyk9r/0szGC4Ur4wUDt9g==", + "version": "6.0.0-prerelease.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-prerelease.4.tgz", + "integrity": "sha512-KHo0v4XG4vS5wSZ76EUOrXDM636/ikXe6lNYqbAL/KRfqhfvXHEESZnK+0p1tpoBwwEUivAmJNSdIjppBPhACg==", + "license": "MIT", "peerDependencies": { "react": "^17 || ^18", "react-dom": "^17 || ^18" } }, "node_modules/@patternfly/react-styles": { - "version": "6.0.0-alpha.29", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-6.0.0-alpha.29.tgz", - "integrity": "sha512-A/VcVS28kUVPcUtyjA07hciAInyxWD9+5TCJM3pZKGPO3Tsvay3EC4pr1yOJiqk1lHGZVwPcu6bxlhJdaC5wCA==" + "version": "6.0.0-prerelease.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-6.0.0-prerelease.3.tgz", + "integrity": "sha512-VyAODCKA/PkyGMVT0A2G2TVVx1H1QKBrmXBwY11Ba3ggvuLZ2zWu+vU9LyM/HhmefOwy+5/P8bmRtLM+37D/CA==", + "license": "MIT" }, "node_modules/@patternfly/react-tokens": { - "version": "6.0.0-alpha.29", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-6.0.0-alpha.29.tgz", - "integrity": "sha512-Jvps/UoG0otjdvAgnuS9SF9a8FW5JgyZvs6tnaWD6sXjq2Jl0aRERV4gsyNEnR2lRaJX7N1S+P2HUpAQE7iFvw==" + "version": "6.0.0-prerelease.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-6.0.0-prerelease.4.tgz", + "integrity": "sha512-T1/C6nj78zvk4zLUp3VvNI3hChPR2vEy0BasIG3AYakWoLJsdOY6qS3PlLulawNZvlK7KH0X7VRfT1Zk073R6A==", + "license": "MIT" }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", @@ -8067,9 +8071,10 @@ } }, "node_modules/focus-trap": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.4.tgz", - "integrity": "sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.0.tgz", + "integrity": "sha512-1td0l3pMkWJLFipobUcGaf+5DTY4PLDDrcqoSaKP8ediO/CoWCCYk/fT/Y2A4e6TNB+Sh6clRJCjOPPnKoNHnQ==", + "license": "MIT", "dependencies": { "tabbable": "^6.2.0" } @@ -16428,7 +16433,8 @@ "node_modules/tabbable": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz", - "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" + "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==", + "license": "MIT" }, "node_modules/tapable": { "version": "1.1.3", @@ -17089,9 +17095,10 @@ } }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "license": "0BSD" }, "node_modules/tty-browserify": { "version": "0.0.0", diff --git a/package.json b/package.json index 6ce09747..1291412a 100644 --- a/package.json +++ b/package.json @@ -72,9 +72,9 @@ "webpack-merge": "^5.10.0" }, "dependencies": { - "@patternfly/react-core": "6.0.0-alpha.83", - "@patternfly/react-icons": "6.0.0-alpha.30", - "@patternfly/react-styles": "6.0.0-alpha.29", + "@patternfly/react-core": "6.0.0-prerelease.13", + "@patternfly/react-icons": "6.0.0-prerelease.4", + "@patternfly/react-styles": "6.0.0-prerelease.3", "react": "^18", "react-dom": "^18", "sirv-cli": "^2.0.2" diff --git a/src/app/AppLayout/AppLayout.tsx b/src/app/AppLayout/AppLayout.tsx index b835224d..c8e036c9 100644 --- a/src/app/AppLayout/AppLayout.tsx +++ b/src/app/AppLayout/AppLayout.tsx @@ -4,16 +4,17 @@ import { Button, Masthead, MastheadBrand, + MastheadLogo, MastheadMain, MastheadToggle, - Nav, + Nav, NavExpandable, NavItem, - NavList, - Page, - PageSidebar, + NavList, + Page, + PageSidebar, PageSidebarBody, - SkipToContent + SkipToContent, } from '@patternfly/react-core'; import { IAppRoute, IAppRouteGroup, routes } from '@app/routes'; import { BarsIcon } from '@patternfly/react-icons'; @@ -26,41 +27,60 @@ const AppLayout: React.FunctionComponent = ({ children }) => { const [sidebarOpen, setSidebarOpen] = React.useState(true); const masthead = ( - - - - - - PatternFly logo - - - - - - - - - - - - - - - - - - + + } + variant="plain" + onClick={() => setSidebarOpen(!sidebarOpen)} + aria-label="Global navigation" + /> + + + + + PatternFly logo + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + @@ -91,7 +111,7 @@ const AppLayout: React.FunctionComponent = ({ children }) => { @@ -99,20 +119,21 @@ const AppLayout: React.FunctionComponent = ({ children }) => { const Sidebar = ( - - {Navigation} - + {Navigation} ); const pageId = 'primary-app-container'; const PageSkipToContent = ( - { - event.preventDefault(); - const primaryContentContainer = document.getElementById(pageId); - primaryContentContainer && primaryContentContainer.focus(); - }} href={`#${pageId}`}> + { + event.preventDefault(); + const primaryContentContainer = document.getElementById(pageId); + primaryContentContainer && primaryContentContainer.focus(); + }} + href={`#${pageId}`} + > Skip to Content ); @@ -121,7 +142,8 @@ const AppLayout: React.FunctionComponent = ({ children }) => { mainContainerId={pageId} masthead={masthead} sidebar={sidebarOpen && Sidebar} - skipToContent={PageSkipToContent}> + skipToContent={PageSkipToContent} + > {children} ); diff --git a/src/app/Dashboard/Dashboard.tsx b/src/app/Dashboard/Dashboard.tsx index 7f04e16d..1cfee40a 100644 --- a/src/app/Dashboard/Dashboard.tsx +++ b/src/app/Dashboard/Dashboard.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { PageSection, Title } from '@patternfly/react-core'; const Dashboard: React.FunctionComponent = () => ( - + Dashboard Page Title! ) diff --git a/src/app/NotFound/NotFound.tsx b/src/app/NotFound/NotFound.tsx index 86b6927f..b83296e2 100644 --- a/src/app/NotFound/NotFound.tsx +++ b/src/app/NotFound/NotFound.tsx @@ -21,7 +21,7 @@ const NotFound: React.FunctionComponent = () => { } return ( - + We didn't find a page that matches the address you navigated to. diff --git a/src/app/Settings/General/GeneralSettings.tsx b/src/app/Settings/General/GeneralSettings.tsx index f70851f0..aae8e12f 100644 --- a/src/app/Settings/General/GeneralSettings.tsx +++ b/src/app/Settings/General/GeneralSettings.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { PageSection, Title } from '@patternfly/react-core'; const GeneralSettings: React.FunctionComponent = () => ( - + General Settings Page Title diff --git a/src/app/Settings/Profile/ProfileSettings.tsx b/src/app/Settings/Profile/ProfileSettings.tsx index c5552441..b5bf7b2b 100644 --- a/src/app/Settings/Profile/ProfileSettings.tsx +++ b/src/app/Settings/Profile/ProfileSettings.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { PageSection, Title } from '@patternfly/react-core'; const ProfileSettings: React.FunctionComponent = () => ( - + Profile Settings Page Title diff --git a/src/app/Support/Support.tsx b/src/app/Support/Support.tsx index a966d53e..685725da 100644 --- a/src/app/Support/Support.tsx +++ b/src/app/Support/Support.tsx @@ -2,15 +2,14 @@ import * as React from 'react'; import { CubesIcon } from '@patternfly/react-icons'; import { Button, + Content, + ContentVariants, EmptyState, EmptyStateActions, EmptyStateBody, EmptyStateFooter, EmptyStateVariant, PageSection, - Text, - TextContent, - TextVariants, } from '@patternfly/react-core'; export interface ISupportProps { @@ -19,30 +18,32 @@ export interface ISupportProps { // eslint-disable-next-line prefer-const let Support: React.FunctionComponent = () => ( - - + + - - + + This represents an the empty state pattern in Patternfly 4. Hopefully it's simple enough to use but flexible enough to meet a variety of needs. - - + + This text has overridden a css component variable to demonstrate how to apply customizations using PatternFly's global variable API. - - - - - - - - - - - - - + + + + + + + + + + + + + + + ); diff --git a/src/app/__snapshots__/app.test.tsx.snap b/src/app/__snapshots__/app.test.tsx.snap index 78a07fae..d1938164 100644 --- a/src/app/__snapshots__/app.test.tsx.snap +++ b/src/app/__snapshots__/app.test.tsx.snap @@ -26,131 +26,137 @@ exports[`App tests should render default App component 1`] = `
- - -
- - - PatternFly logo - - - - - - - - - + + + + +
+ + + +
-
-

- Dashboard Page Title! -

-
+ Dashboard Page Title! +