Skip to content

Fix: Clean up dependencies in main branch #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 4, 2024
Merged

Fix: Clean up dependencies in main branch #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
248be19
fix: update deps starting with PF
nicolethoen Jun 4, 2024
992d4b0
fix: update storybook deps
nicolethoen Jun 4, 2024
63e153f
update lint & jest deps
nicolethoen Jun 4, 2024
0537b0c
more updates related to lint
nicolethoen Jun 4, 2024
168610d
update rest of minor version bumps
nicolethoen Jun 4, 2024
bb409eb
update lock file
nicolethoen Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46,878 changes: 14,266 additions & 32,612 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

67 changes: 34 additions & 33 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,61 +28,62 @@
},
"devDependencies": {
"@redhat-cloud-services/eslint-config-redhat-cloud-services": "^1.3.0",
"@storybook/addon-actions": "^7.0.27",
"@storybook/addon-actions": "^7.6.19",
"@storybook/addon-info": "^5.3.21",
"@storybook/addon-knobs": "^7.0.2",
"@storybook/addon-links": "^7.0.27",
"@storybook/addons": "^7.0.27",
"@storybook/react": "^7.0.27",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@storybook/addon-knobs": "^7.1.1",
"@storybook/addon-links": "^7.6.19",
"@storybook/addons": "^7.6.17",
"@storybook/react": "^7.6.19",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.3.1",
"@testing-library/user-event": "14.4.3",
"@types/jest": "^29.5.3",
"@types/react-router-dom": "^5.3.3",
"@types/victory": "^33.1.5",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.8.1",
"css-loader": "^6.11.0",
"css-minimizer-webpack-plugin": "^5.0.1",
"dotenv-webpack": "^8.0.1",
"eslint": "^8.44.0",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"html-webpack-plugin": "^5.5.3",
"eslint": "^8.57.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.2",
"eslint-plugin-react-hooks": "^4.6.2",
"html-webpack-plugin": "^5.6.0",
"imagemin": "^8.0.1",
"jest": "^29.6.1",
"jest-environment-jsdom": "^29.6.1",
"mini-css-extract-plugin": "^2.7.6",
"postcss": "^8.4.31",
"prettier": "^3.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"mini-css-extract-plugin": "^2.9.0",
"postcss": "^8.4.38",
"prettier": "^3.3.0",
"prop-types": "^15.8.1",
"raw-loader": "^4.0.2",
"react-axe": "^3.5.4",
"react-docgen-typescript-loader": "^3.7.2",
"react-router-dom": "^5.3.4",
"regenerator-runtime": "^0.13.11",
"rimraf": "^5.0.1",
"style-loader": "^3.3.3",
"rimraf": "^5.0.7",
"style-loader": "^3.3.4",
"svg-url-loader": "^8.0.0",
"terser-webpack-plugin": "^5.3.9",
"ts-jest": "^29.1.1",
"ts-loader": "^9.4.4",
"terser-webpack-plugin": "^5.3.10",
"ts-jest": "^29.1.4",
"ts-loader": "^9.5.1",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"tslib": "^2.6.0",
"typescript": "^5.1.6",
"typescript": "^5.4.5",
"url-loader": "^4.1.1",
"webpack": "^5.88.1",
"webpack-bundle-analyzer": "^4.9.0",
"webpack": "^5.91.0",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
"webpack-dev-server": "^4.15.2",
"webpack-merge": "^5.10.0"
},
"dependencies": {
"@patternfly/react-core": "6.0.0-alpha.50",
"@patternfly/react-icons": "6.0.0-alpha.19",
"@patternfly/react-styles": "6.0.0-alpha.19",
"@storybook/builder-webpack5": "^7.5.3",
"@patternfly/react-core": "5.3.3",
"@patternfly/react-icons": "5.3.2",
"@patternfly/react-styles": "5.3.1",
"@storybook/builder-webpack5": "^7.6.19",
"react": "^18",
"react-dom": "^18",
"sirv-cli": "^2.0.2"
Expand Down
5 changes: 4 additions & 1 deletion src/app/NotFound/NotFound.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
EmptyState,
EmptyStateBody,
EmptyStateFooter,
EmptyStateHeader,
EmptyStateIcon,
PageSection,
} from '@patternfly/react-core';
import { useHistory } from 'react-router-dom';
Expand All @@ -22,7 +24,8 @@ const NotFound: React.FunctionComponent = () => {

return (
<PageSection>
<EmptyState titleText="404 Page not found" variant="full" icon={ExclamationTriangleIcon} >
<EmptyState variant="full">
<EmptyStateHeader titleText="404 Page not found" icon={<EmptyStateIcon icon={ExclamationTriangleIcon} />} headingLevel="h1" />
<EmptyStateBody>
We didn&apos;t find a page that matches the address you navigated to.
</EmptyStateBody><EmptyStateFooter>
Expand Down
5 changes: 4 additions & 1 deletion src/app/Support/Support.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import {
EmptyStateActions,
EmptyStateBody,
EmptyStateFooter,
EmptyStateHeader,
EmptyStateIcon,
EmptyStateVariant,
PageSection,
Text,
Expand All @@ -20,7 +22,8 @@ export interface ISupportProps {
// eslint-disable-next-line prefer-const
let Support: React.FunctionComponent<ISupportProps> = () => (
<PageSection>
<EmptyState variant={EmptyStateVariant.full} titleText="Empty State (Stub Support Module)" icon={CubesIcon} >
<EmptyState variant={EmptyStateVariant.full}>
<EmptyStateHeader titleText="Empty State (Stub Support Module)" icon={<EmptyStateIcon icon={CubesIcon} />} headingLevel="h1" />
<EmptyStateBody>
<TextContent>
<Text component="p">
Expand Down
90 changes: 43 additions & 47 deletions src/app/__snapshots__/app.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
exports[`App tests should render default App component 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-page"
class="pf-v5-c-page"
>
<div
class="pf-v6-c-skip-to-content"
class="pf-v5-c-skip-to-content"
>
<a
aria-disabled="false"
class="pf-v6-c-button pf-m-primary"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-1"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
Expand All @@ -20,23 +20,23 @@ exports[`App tests should render default App component 1`] = `
</a>
</div>
<header
class="pf-v6-c-masthead pf-m-display-inline-on-md"
class="pf-v5-c-masthead pf-m-display-inline-on-md"
>
<span
class="pf-v6-c-masthead__toggle"
class="pf-v5-c-masthead__toggle"
>
<button
aria-disabled="false"
aria-label="Global navigation"
class="pf-v6-c-button pf-m-plain"
class="pf-v5-c-button pf-m-plain"
data-ouia-component-id="OUIA-Generated-Button-plain-1"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
type="button"
>
<svg
aria-hidden="true"
class="pf-v6-svg"
class="pf-v5-svg"
fill="currentColor"
height="1em"
role="img"
Expand All @@ -50,10 +50,10 @@ exports[`App tests should render default App component 1`] = `
</button>
</span>
<div
class="pf-v6-c-masthead__main"
class="pf-v5-c-masthead__main"
>
<span
class="pf-v6-c-masthead__brand"
class="pf-v5-c-masthead__brand"
>
<svg
height="40px"
Expand Down Expand Up @@ -147,73 +147,73 @@ exports[`App tests should render default App component 1`] = `
</header>
<div
aria-hidden="false"
class="pf-v6-c-page__sidebar pf-m-expanded"
class="pf-v5-c-page__sidebar pf-m-expanded"
id="page-sidebar"
>
<div
class="pf-v6-c-page__sidebar-body"
class="pf-v5-c-page__sidebar-body"
>
<nav
aria-label="Global"
class="pf-v6-c-nav"
class="pf-v5-c-nav"
data-ouia-component-id="OUIA-Generated-Nav-1"
data-ouia-component-type="PF5/Nav"
data-ouia-safe="true"
id="nav-primary-simple"
>
<ul
class="pf-v6-c-nav__list"
class="pf-v5-c-nav__list"
id="nav-list-simple"
role="list"
>
<li
class="pf-v6-c-nav__item"
class="pf-v5-c-nav__item"
data-ouia-component-id="OUIA-Generated-NavItem-1"
data-ouia-component-type="PF5/NavItem"
data-ouia-safe="true"
>
<a
aria-current="page"
class="pf-v6-c-nav__link pf-m-current active"
class="pf-v5-c-nav__link pf-m-current active"
href="/"
>
Dashboard
</a>
</li>
<li
class="pf-v6-c-nav__item"
class="pf-v5-c-nav__item"
data-ouia-component-id="OUIA-Generated-NavItem-2"
data-ouia-component-type="PF5/NavItem"
data-ouia-safe="true"
>
<a
class="pf-v6-c-nav__link"
class="pf-v5-c-nav__link"
href="/support"
>
Support
</a>
</li>
<li
class="pf-v6-c-nav__item"
class="pf-v5-c-nav__item pf-m-expandable"
data-ouia-component-id="OUIA-Generated-NavExpandable-1"
data-ouia-component-type="PF5/NavExpandable"
data-ouia-safe="true"
>
<button
aria-expanded="false"
class="pf-v6-c-nav__link"
class="pf-v5-c-nav__link"
id="Settings-2"
>
Settings
<span
class="pf-v6-c-nav__toggle"
class="pf-v5-c-nav__toggle"
>
<span
class="pf-v6-c-nav__toggle-icon"
class="pf-v5-c-nav__toggle-icon"
>
<svg
aria-hidden="true"
class="pf-v6-svg"
class="pf-v5-svg"
fill="currentColor"
height="1em"
role="img"
Expand All @@ -229,34 +229,34 @@ exports[`App tests should render default App component 1`] = `
</button>
<section
aria-labelledby="Settings-2"
class="pf-v6-c-nav__subnav"
class="pf-v5-c-nav__subnav"
hidden=""
>
<ul
class="pf-v6-c-nav__list"
class="pf-v5-c-nav__list"
role="list"
>
<li
class="pf-v6-c-nav__item"
class="pf-v5-c-nav__item"
data-ouia-component-id="OUIA-Generated-NavItem-3"
data-ouia-component-type="PF5/NavItem"
data-ouia-safe="true"
>
<a
class="pf-v6-c-nav__link"
class="pf-v5-c-nav__link"
href="/settings/general"
>
General
</a>
</li>
<li
class="pf-v6-c-nav__item"
class="pf-v5-c-nav__item"
data-ouia-component-id="OUIA-Generated-NavItem-4"
data-ouia-component-type="PF5/NavItem"
data-ouia-safe="true"
>
<a
class="pf-v6-c-nav__link"
class="pf-v5-c-nav__link"
href="/settings/profile"
>
Profile
Expand All @@ -269,28 +269,24 @@ exports[`App tests should render default App component 1`] = `
</nav>
</div>
</div>
<div
class="pf-v6-c-page__main-container"
<main
class="pf-v5-c-page__main"
id="primary-app-container"
tabindex="-1"
>
<main
class="pf-v6-c-page__main"
id="primary-app-container"
tabindex="-1"
<section
class="pf-v5-c-page__main-section"
>
<section
class="pf-v6-c-page__main-section"
<h1
class="pf-v5-c-title pf-m-lg"
data-ouia-component-id="OUIA-Generated-Title-1"
data-ouia-component-type="PF5/Title"
data-ouia-safe="true"
>
<h1
class="pf-v6-c-title pf-m-lg"
data-ouia-component-id="OUIA-Generated-Title-1"
data-ouia-component-type="PF5/Title"
data-ouia-safe="true"
>
Dashboard Page Title!
</h1>
</section>
</main>
</div>
Dashboard Page Title!
</h1>
</section>
</main>
</div>
</DocumentFragment>
`;
Loading
Loading