Skip to content

Commit 70473c8

Browse files
nicolethoennicolethoen
authored
Merge pull request #225 from nicolethoen/clean_up_main
Fix: Clean up dependencies in main branch
2 parents be48bc3 + bb409eb commit 70473c8

File tree

7 files changed

+14363
-32706
lines changed

7 files changed

+14363
-32706
lines changed

‎package-lock.json

Lines changed: 14266 additions & 32612 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -28,61 +28,62 @@
2828
},
2929
"devDependencies": {
3030
"@redhat-cloud-services/eslint-config-redhat-cloud-services": "^1.3.0",
31-
"@storybook/addon-actions": "^7.0.27",
31+
"@storybook/addon-actions": "^7.6.19",
3232
"@storybook/addon-info": "^5.3.21",
33-
"@storybook/addon-knobs": "^7.0.2",
34-
"@storybook/addon-links": "^7.0.27",
35-
"@storybook/addons": "^7.0.27",
36-
"@storybook/react": "^7.0.27",
37-
"@testing-library/jest-dom": "^5.16.5",
38-
"@testing-library/react": "^14.0.0",
33+
"@storybook/addon-knobs": "^7.1.1",
34+
"@storybook/addon-links": "^7.6.19",
35+
"@storybook/addons": "^7.6.17",
36+
"@storybook/react": "^7.6.19",
37+
"@testing-library/jest-dom": "^5.17.0",
38+
"@testing-library/react": "^14.3.1",
3939
"@testing-library/user-event": "14.4.3",
4040
"@types/jest": "^29.5.3",
4141
"@types/react-router-dom": "^5.3.3",
4242
"@types/victory": "^33.1.5",
43-
"@typescript-eslint/eslint-plugin": "^6.0.0",
44-
"@typescript-eslint/parser": "^6.0.0",
43+
"@typescript-eslint/eslint-plugin": "^6.21.0",
44+
"@typescript-eslint/parser": "^6.21.0",
4545
"copy-webpack-plugin": "^11.0.0",
46-
"css-loader": "^6.8.1",
46+
"css-loader": "^6.11.0",
4747
"css-minimizer-webpack-plugin": "^5.0.1",
4848
"dotenv-webpack": "^8.0.1",
49-
"eslint": "^8.44.0",
50-
"eslint-plugin-react": "^7.32.2",
51-
"eslint-plugin-react-hooks": "^4.6.0",
52-
"html-webpack-plugin": "^5.5.3",
49+
"eslint": "^8.57.0",
50+
"eslint-plugin-prettier": "^5.1.3",
51+
"eslint-plugin-react": "^7.34.2",
52+
"eslint-plugin-react-hooks": "^4.6.2",
53+
"html-webpack-plugin": "^5.6.0",
5354
"imagemin": "^8.0.1",
54-
"jest": "^29.6.1",
55-
"jest-environment-jsdom": "^29.6.1",
56-
"mini-css-extract-plugin": "^2.7.6",
57-
"postcss": "^8.4.31",
58-
"prettier": "^3.0.0",
55+
"jest": "^29.7.0",
56+
"jest-environment-jsdom": "^29.7.0",
57+
"mini-css-extract-plugin": "^2.9.0",
58+
"postcss": "^8.4.38",
59+
"prettier": "^3.3.0",
5960
"prop-types": "^15.8.1",
6061
"raw-loader": "^4.0.2",
6162
"react-axe": "^3.5.4",
6263
"react-docgen-typescript-loader": "^3.7.2",
6364
"react-router-dom": "^5.3.4",
6465
"regenerator-runtime": "^0.13.11",
65-
"rimraf": "^5.0.1",
66-
"style-loader": "^3.3.3",
66+
"rimraf": "^5.0.7",
67+
"style-loader": "^3.3.4",
6768
"svg-url-loader": "^8.0.0",
68-
"terser-webpack-plugin": "^5.3.9",
69-
"ts-jest": "^29.1.1",
70-
"ts-loader": "^9.4.4",
69+
"terser-webpack-plugin": "^5.3.10",
70+
"ts-jest": "^29.1.4",
71+
"ts-loader": "^9.5.1",
7172
"tsconfig-paths-webpack-plugin": "^4.1.0",
7273
"tslib": "^2.6.0",
73-
"typescript": "^5.1.6",
74+
"typescript": "^5.4.5",
7475
"url-loader": "^4.1.1",
75-
"webpack": "^5.88.1",
76-
"webpack-bundle-analyzer": "^4.9.0",
76+
"webpack": "^5.91.0",
77+
"webpack-bundle-analyzer": "^4.10.2",
7778
"webpack-cli": "^5.1.4",
78-
"webpack-dev-server": "^4.15.1",
79-
"webpack-merge": "^5.9.0"
79+
"webpack-dev-server": "^4.15.2",
80+
"webpack-merge": "^5.10.0"
8081
},
8182
"dependencies": {
82-
"@patternfly/react-core": "6.0.0-alpha.50",
83-
"@patternfly/react-icons": "6.0.0-alpha.19",
84-
"@patternfly/react-styles": "6.0.0-alpha.19",
85-
"@storybook/builder-webpack5": "^7.5.3",
83+
"@patternfly/react-core": "5.3.3",
84+
"@patternfly/react-icons": "5.3.2",
85+
"@patternfly/react-styles": "5.3.1",
86+
"@storybook/builder-webpack5": "^7.6.19",
8687
"react": "^18",
8788
"react-dom": "^18",
8889
"sirv-cli": "^2.0.2"

‎src/app/NotFound/NotFound.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import {
55
EmptyState,
66
EmptyStateBody,
77
EmptyStateFooter,
8+
EmptyStateHeader,
9+
EmptyStateIcon,
810
PageSection,
911
} from '@patternfly/react-core';
1012
import { useHistory } from 'react-router-dom';
@@ -22,7 +24,8 @@ const NotFound: React.FunctionComponent = () => {
2224

2325
return (
2426
<PageSection>
25-
<EmptyState titleText="404 Page not found" variant="full" icon={ExclamationTriangleIcon} >
27+
<EmptyState variant="full">
28+
<EmptyStateHeader titleText="404 Page not found" icon={<EmptyStateIcon icon={ExclamationTriangleIcon} />} headingLevel="h1" />
2629
<EmptyStateBody>
2730
We didn&apos;t find a page that matches the address you navigated to.
2831
</EmptyStateBody><EmptyStateFooter>

‎src/app/Support/Support.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import {
66
EmptyStateActions,
77
EmptyStateBody,
88
EmptyStateFooter,
9+
EmptyStateHeader,
10+
EmptyStateIcon,
911
EmptyStateVariant,
1012
PageSection,
1113
Text,
@@ -20,7 +22,8 @@ export interface ISupportProps {
2022
// eslint-disable-next-line prefer-const
2123
let Support: React.FunctionComponent<ISupportProps> = () => (
2224
<PageSection>
23-
<EmptyState variant={EmptyStateVariant.full} titleText="Empty State (Stub Support Module)" icon={CubesIcon} >
25+
<EmptyState variant={EmptyStateVariant.full}>
26+
<EmptyStateHeader titleText="Empty State (Stub Support Module)" icon={<EmptyStateIcon icon={CubesIcon} />} headingLevel="h1" />
2427
<EmptyStateBody>
2528
<TextContent>
2629
<Text component="p">

‎src/app/__snapshots__/app.test.tsx.snap

Lines changed: 43 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
exports[`App tests should render default App component 1`] = `
44
<DocumentFragment>
55
<div
6-
class="pf-v6-c-page"
6+
class="pf-v5-c-page"
77
>
88
<div
9-
class="pf-v6-c-skip-to-content"
9+
class="pf-v5-c-skip-to-content"
1010
>
1111
<a
1212
aria-disabled="false"
13-
class="pf-v6-c-button pf-m-primary"
13+
class="pf-v5-c-button pf-m-primary"
1414
data-ouia-component-id="OUIA-Generated-Button-primary-1"
1515
data-ouia-component-type="PF5/Button"
1616
data-ouia-safe="true"
@@ -20,23 +20,23 @@ exports[`App tests should render default App component 1`] = `
2020
</a>
2121
</div>
2222
<header
23-
class="pf-v6-c-masthead pf-m-display-inline-on-md"
23+
class="pf-v5-c-masthead pf-m-display-inline-on-md"
2424
>
2525
<span
26-
class="pf-v6-c-masthead__toggle"
26+
class="pf-v5-c-masthead__toggle"
2727
>
2828
<button
2929
aria-disabled="false"
3030
aria-label="Global navigation"
31-
class="pf-v6-c-button pf-m-plain"
31+
class="pf-v5-c-button pf-m-plain"
3232
data-ouia-component-id="OUIA-Generated-Button-plain-1"
3333
data-ouia-component-type="PF5/Button"
3434
data-ouia-safe="true"
3535
type="button"
3636
>
3737
<svg
3838
aria-hidden="true"
39-
class="pf-v6-svg"
39+
class="pf-v5-svg"
4040
fill="currentColor"
4141
height="1em"
4242
role="img"
@@ -50,10 +50,10 @@ exports[`App tests should render default App component 1`] = `
5050
</button>
5151
</span>
5252
<div
53-
class="pf-v6-c-masthead__main"
53+
class="pf-v5-c-masthead__main"
5454
>
5555
<span
56-
class="pf-v6-c-masthead__brand"
56+
class="pf-v5-c-masthead__brand"
5757
>
5858
<svg
5959
height="40px"
@@ -147,73 +147,73 @@ exports[`App tests should render default App component 1`] = `
147147
</header>
148148
<div
149149
aria-hidden="false"
150-
class="pf-v6-c-page__sidebar pf-m-expanded"
150+
class="pf-v5-c-page__sidebar pf-m-expanded"
151151
id="page-sidebar"
152152
>
153153
<div
154-
class="pf-v6-c-page__sidebar-body"
154+
class="pf-v5-c-page__sidebar-body"
155155
>
156156
<nav
157157
aria-label="Global"
158-
class="pf-v6-c-nav"
158+
class="pf-v5-c-nav"
159159
data-ouia-component-id="OUIA-Generated-Nav-1"
160160
data-ouia-component-type="PF5/Nav"
161161
data-ouia-safe="true"
162162
id="nav-primary-simple"
163163
>
164164
<ul
165-
class="pf-v6-c-nav__list"
165+
class="pf-v5-c-nav__list"
166166
id="nav-list-simple"
167167
role="list"
168168
>
169169
<li
170-
class="pf-v6-c-nav__item"
170+
class="pf-v5-c-nav__item"
171171
data-ouia-component-id="OUIA-Generated-NavItem-1"
172172
data-ouia-component-type="PF5/NavItem"
173173
data-ouia-safe="true"
174174
>
175175
<a
176176
aria-current="page"
177-
class="pf-v6-c-nav__link pf-m-current active"
177+
class="pf-v5-c-nav__link pf-m-current active"
178178
href="/"
179179
>
180180
Dashboard
181181
</a>
182182
</li>
183183
<li
184-
class="pf-v6-c-nav__item"
184+
class="pf-v5-c-nav__item"
185185
data-ouia-component-id="OUIA-Generated-NavItem-2"
186186
data-ouia-component-type="PF5/NavItem"
187187
data-ouia-safe="true"
188188
>
189189
<a
190-
class="pf-v6-c-nav__link"
190+
class="pf-v5-c-nav__link"
191191
href="/support"
192192
>
193193
Support
194194
</a>
195195
</li>
196196
<li
197-
class="pf-v6-c-nav__item"
197+
class="pf-v5-c-nav__item pf-m-expandable"
198198
data-ouia-component-id="OUIA-Generated-NavExpandable-1"
199199
data-ouia-component-type="PF5/NavExpandable"
200200
data-ouia-safe="true"
201201
>
202202
<button
203203
aria-expanded="false"
204-
class="pf-v6-c-nav__link"
204+
class="pf-v5-c-nav__link"
205205
id="Settings-2"
206206
>
207207
Settings
208208
<span
209-
class="pf-v6-c-nav__toggle"
209+
class="pf-v5-c-nav__toggle"
210210
>
211211
<span
212-
class="pf-v6-c-nav__toggle-icon"
212+
class="pf-v5-c-nav__toggle-icon"
213213
>
214214
<svg
215215
aria-hidden="true"
216-
class="pf-v6-svg"
216+
class="pf-v5-svg"
217217
fill="currentColor"
218218
height="1em"
219219
role="img"
@@ -229,34 +229,34 @@ exports[`App tests should render default App component 1`] = `
229229
</button>
230230
<section
231231
aria-labelledby="Settings-2"
232-
class="pf-v6-c-nav__subnav"
232+
class="pf-v5-c-nav__subnav"
233233
hidden=""
234234
>
235235
<ul
236-
class="pf-v6-c-nav__list"
236+
class="pf-v5-c-nav__list"
237237
role="list"
238238
>
239239
<li
240-
class="pf-v6-c-nav__item"
240+
class="pf-v5-c-nav__item"
241241
data-ouia-component-id="OUIA-Generated-NavItem-3"
242242
data-ouia-component-type="PF5/NavItem"
243243
data-ouia-safe="true"
244244
>
245245
<a
246-
class="pf-v6-c-nav__link"
246+
class="pf-v5-c-nav__link"
247247
href="/settings/general"
248248
>
249249
General
250250
</a>
251251
</li>
252252
<li
253-
class="pf-v6-c-nav__item"
253+
class="pf-v5-c-nav__item"
254254
data-ouia-component-id="OUIA-Generated-NavItem-4"
255255
data-ouia-component-type="PF5/NavItem"
256256
data-ouia-safe="true"
257257
>
258258
<a
259-
class="pf-v6-c-nav__link"
259+
class="pf-v5-c-nav__link"
260260
href="/settings/profile"
261261
>
262262
Profile
@@ -269,28 +269,24 @@ exports[`App tests should render default App component 1`] = `
269269
</nav>
270270
</div>
271271
</div>
272-
<div
273-
class="pf-v6-c-page__main-container"
272+
<main
273+
class="pf-v5-c-page__main"
274+
id="primary-app-container"
275+
tabindex="-1"
274276
>
275-
<main
276-
class="pf-v6-c-page__main"
277-
id="primary-app-container"
278-
tabindex="-1"
277+
<section
278+
class="pf-v5-c-page__main-section"
279279
>
280-
<section
281-
class="pf-v6-c-page__main-section"
280+
<h1
281+
class="pf-v5-c-title pf-m-lg"
282+
data-ouia-component-id="OUIA-Generated-Title-1"
283+
data-ouia-component-type="PF5/Title"
284+
data-ouia-safe="true"
282285
>
283-
<h1
284-
class="pf-v6-c-title pf-m-lg"
285-
data-ouia-component-id="OUIA-Generated-Title-1"
286-
data-ouia-component-type="PF5/Title"
287-
data-ouia-safe="true"
288-
>
289-
Dashboard Page Title!
290-
</h1>
291-
</section>
292-
</main>
293-
</div>
286+
Dashboard Page Title!
287+
</h1>
288+
</section>
289+
</main>
294290
</div>
295291
</DocumentFragment>
296292
`;

0 commit comments

Comments
 (0)