Skip to content

Commit 74092de

Browse files
fhlavacfhlavac
committed
fix(pf6): Update generated files
1 parent b4b25e2 commit 74092de

File tree

9 files changed

+230
-3275
lines changed

9 files changed

+230
-3275
lines changed

‎package-lock.json‎

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

‎packages/module/src/BulkSelect/__snapshots__/BulkSelect.test.tsx.snap‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ exports[`BulkSelect component should render 1`] = `
3131
aria-expanded="false"
3232
aria-label="Bulk select toggle"
3333
class="pf-v6-c-menu-toggle__button"
34-
<<<<<<< HEAD
3534
data-ouia-component-id="BulkSelect-toggle"
36-
=======
37-
data-ouia-component-id="OUIA-Generated-MenuToggle-1"
38-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
3935
data-ouia-component-type="PF6/MenuToggle"
4036
data-ouia-safe="true"
4137
type="button"
@@ -92,11 +88,7 @@ exports[`BulkSelect component should render 1`] = `
9288
aria-expanded="false"
9389
aria-label="Bulk select toggle"
9490
class="pf-v6-c-menu-toggle__button"
95-
<<<<<<< HEAD
9691
data-ouia-component-id="BulkSelect-toggle"
97-
=======
98-
data-ouia-component-id="OUIA-Generated-MenuToggle-1"
99-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
10092
data-ouia-component-type="PF6/MenuToggle"
10193
data-ouia-safe="true"
10294
type="button"

‎packages/module/src/ContentHeader/__snapshots__/ContentHeader.test.tsx.snap‎

Lines changed: 0 additions & 284 deletions
Original file line numberDiff line numberDiff line change
@@ -6,219 +6,13 @@ exports[`Contentheader component should render 1`] = `
66
"baseElement": <body>
77
<div>
88
<section
9-
<<<<<<< HEAD
10-
<<<<<<< HEAD
119
class="pf-v6-c-page__main-section"
1210
>
1311
<div
14-
<<<<<<< HEAD
15-
class="pf-v6-c-page__main-body"
16-
=======
17-
<<<<<<< HEAD
18-
class="pf-v5-c-page__main-section pf-m-light"
19-
>
20-
<div
21-
class="pf-v5-l-flex"
22-
=======
23-
class="pf-v6-c-page__main-section"
24-
>
25-
<div
26-
<<<<<<< HEAD
2712
class="pf-v6-l-flex"
28-
>>>>>>> 7d5bf1e (Update to PatternFly 6 (#145))
29-
<<<<<<< HEAD
30-
>>>>>>> e4d8972 (Update to PatternFly 6 (#145))
31-
=======
32-
=======
33-
class="pf-v6-c-page__main-body"
34-
>>>>>>> fbe8303 (Update to the latest PF versions (#224))
35-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
36-
=======
37-
class="pf-v6-c-page__main-section"
38-
>
39-
<div
40-
class="pf-v6-c-page__main-body"
41-
>>>>>>> 34b69c4 (fix(v6): Fix generated files)
4213
>
4314
<div
44-
class="pf-v6-l-flex"
45-
>
46-
<div
47-
<<<<<<< HEAD
48-
<<<<<<< HEAD
49-
<<<<<<< HEAD
50-
class="pf-m-flex-1"
51-
=======
52-
=======
53-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
54-
<<<<<<< HEAD
55-
class="pf-v5-l-split pf-m-gutter"
56-
>>>>>>> e4d8972 (Update to PatternFly 6 (#145))
57-
>
58-
<div
59-
class="pf-v6-l-split pf-m-gutter"
60-
>
61-
<div
62-
class="pf-v6-l-split__item"
63-
>
64-
<h1
65-
class="pf-v6-c-content--h1 pf-v6-u-mb-sm"
66-
data-ouia-component-id="ContentHeader-title"
67-
<<<<<<< HEAD
68-
data-ouia-component-type="PF6/Content"
69-
=======
70-
data-ouia-component-type="PF5/Text"
71-
=======
72-
class="pf-v6-l-split pf-m-gutter"
73-
=======
74-
=======
75-
>>>>>>> 34b69c4 (fix(v6): Fix generated files)
76-
class="pf-m-flex-1"
77-
>
78-
<div
79-
class="pf-v6-l-split pf-m-gutter"
80-
>
81-
<div
82-
class="pf-v6-l-split__item"
83-
>
84-
<h1
85-
class="pf-v6-c-content--h1 pf-v6-u-mb-sm"
86-
data-ouia-component-id="ContentHeader-title"
87-
<<<<<<< HEAD
88-
<<<<<<< HEAD
89-
data-ouia-component-type="PF6/Text"
90-
>>>>>>> 7d5bf1e (Update to PatternFly 6 (#145))
91-
<<<<<<< HEAD
92-
>>>>>>> e4d8972 (Update to PatternFly 6 (#145))
93-
=======
94-
=======
95-
data-ouia-component-type="PF6/Content"
96-
>>>>>>> fbe8303 (Update to the latest PF versions (#224))
97-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
98-
=======
99-
data-ouia-component-type="PF6/Content"
100-
>>>>>>> 34b69c4 (fix(v6): Fix generated files)
101-
data-ouia-safe="true"
102-
data-pf-content="true"
103-
>
104-
My title
105-
</h1>
106-
</div>
107-
<div
108-
class="pf-v6-l-split__item pf-m-fill"
109-
/>
110-
</div>
111-
<<<<<<< HEAD
112-
<<<<<<< HEAD
113-
<<<<<<< HEAD
114-
=======
115-
=======
116-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
117-
<div
118-
<<<<<<< HEAD
119-
class="pf-v5-l-split__item pf-m-fill"
120-
/>
121-
</div>
122-
<div
123-
class="pf-v5-c-content"
124-
>
125-
>>>>>>> e4d8972 (Update to PatternFly 6 (#145))
126-
<p
127-
class="pf-v6-c-content--p"
128-
data-ouia-component-id="ContentHeader-subtitle"
129-
<<<<<<< HEAD
130-
data-ouia-component-type="PF6/Content"
131-
=======
132-
data-ouia-component-type="PF5/Text"
133-
=======
134-
class="pf-v6-l-split__item pf-m-fill"
135-
/>
136-
</div>
137-
<div
138-
class="pf-v6-c-content"
139-
>
140-
<p
141-
class="pf-v6-c-content--p"
142-
data-ouia-component-id="ContentHeader-subtitle"
143-
data-ouia-component-type="PF6/Text"
144-
>>>>>>> 7d5bf1e (Update to PatternFly 6 (#145))
145-
<<<<<<< HEAD
146-
>>>>>>> e4d8972 (Update to PatternFly 6 (#145))
147-
=======
148-
=======
149-
=======
150-
>>>>>>> 34b69c4 (fix(v6): Fix generated files)
151-
<p
152-
class="pf-v6-c-content--p"
153-
data-ouia-component-id="ContentHeader-subtitle"
154-
data-ouia-component-type="PF6/Content"
155-
<<<<<<< HEAD
156-
>>>>>>> fbe8303 (Update to the latest PF versions (#224))
157-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
158-
=======
159-
>>>>>>> 34b69c4 (fix(v6): Fix generated files)
160-
data-ouia-safe="true"
161-
data-pf-content="true"
162-
>
163-
This is a subtitle for your content header
164-
</p>
165-
</div>
166-
</div>
167-
</div>
168-
</section>
169-
</div>
170-
</body>,
171-
"container": <div>
172-
<section
173-
<<<<<<< HEAD
174-
<<<<<<< HEAD
175-
class="pf-v6-c-page__main-section"
176-
>
177-
<div
178-
class="pf-v6-c-page__main-body"
179-
=======
180-
<<<<<<< HEAD
181-
class="pf-v5-c-page__main-section pf-m-light"
182-
>
183-
<div
184-
class="pf-v5-l-flex"
185-
=======
186-
class="pf-v6-c-page__main-section"
187-
>
188-
<div
189-
<<<<<<< HEAD
190-
class="pf-v6-l-flex"
191-
>>>>>>> 7d5bf1e (Update to PatternFly 6 (#145))
192-
<<<<<<< HEAD
193-
>>>>>>> e4d8972 (Update to PatternFly 6 (#145))
194-
=======
195-
=======
196-
class="pf-v6-c-page__main-body"
197-
>>>>>>> fbe8303 (Update to the latest PF versions (#224))
198-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
199-
=======
200-
class="pf-v6-c-page__main-section"
201-
>
202-
<div
203-
class="pf-v6-c-page__main-body"
204-
>>>>>>> 34b69c4 (fix(v6): Fix generated files)
205-
>
206-
<div
207-
=======
208-
>>>>>>> e41be4f (Update snapshots)
209-
class="pf-v6-l-flex"
210-
>
211-
<div
212-
<<<<<<< HEAD
213-
<<<<<<< HEAD
214-
<<<<<<< HEAD
21515
class="pf-m-flex-1"
216-
=======
217-
=======
218-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
219-
<<<<<<< HEAD
220-
class="pf-v5-l-split pf-m-gutter"
221-
>>>>>>> e4d8972 (Update to PatternFly 6 (#145))
22216
>
22317
<div
22418
class="pf-v6-l-split pf-m-gutter"
@@ -229,40 +23,7 @@ exports[`Contentheader component should render 1`] = `
22923
<h1
23024
class="pf-v6-c-content--h1 pf-v6-u-mb-sm"
23125
data-ouia-component-id="ContentHeader-title"
232-
<<<<<<< HEAD
23326
data-ouia-component-type="PF6/Content"
234-
=======
235-
data-ouia-component-type="PF5/Text"
236-
=======
237-
class="pf-v6-l-split pf-m-gutter"
238-
=======
239-
=======
240-
>>>>>>> 34b69c4 (fix(v6): Fix generated files)
241-
class="pf-m-flex-1"
242-
>
243-
<div
244-
class="pf-v6-l-split pf-m-gutter"
245-
>
246-
<div
247-
class="pf-v6-l-split__item"
248-
>
249-
<h1
250-
class="pf-v6-c-content--h1 pf-v6-u-mb-sm"
251-
data-ouia-component-id="ContentHeader-title"
252-
<<<<<<< HEAD
253-
<<<<<<< HEAD
254-
data-ouia-component-type="PF6/Text"
255-
>>>>>>> 7d5bf1e (Update to PatternFly 6 (#145))
256-
<<<<<<< HEAD
257-
>>>>>>> e4d8972 (Update to PatternFly 6 (#145))
258-
=======
259-
=======
260-
data-ouia-component-type="PF6/Content"
261-
>>>>>>> fbe8303 (Update to the latest PF versions (#224))
262-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
263-
=======
264-
data-ouia-component-type="PF6/Content"
265-
>>>>>>> 34b69c4 (fix(v6): Fix generated files)
26627
data-ouia-safe="true"
26728
data-pf-content="true"
26829
>
@@ -273,55 +34,10 @@ exports[`Contentheader component should render 1`] = `
27334
class="pf-v6-l-split__item pf-m-fill"
27435
/>
27536
</div>
276-
<<<<<<< HEAD
277-
<<<<<<< HEAD
278-
<<<<<<< HEAD
279-
=======
280-
=======
281-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
282-
<div
283-
<<<<<<< HEAD
284-
class="pf-v5-l-split__item pf-m-fill"
285-
/>
286-
</div>
287-
<div
288-
class="pf-v5-c-content"
289-
>
290-
>>>>>>> e4d8972 (Update to PatternFly 6 (#145))
291-
<p
292-
class="pf-v6-c-content--p"
293-
data-ouia-component-id="ContentHeader-subtitle"
294-
<<<<<<< HEAD
295-
data-ouia-component-type="PF6/Content"
296-
=======
297-
data-ouia-component-type="PF5/Text"
298-
=======
299-
class="pf-v6-l-split__item pf-m-fill"
300-
/>
301-
</div>
302-
<div
303-
class="pf-v6-c-content"
304-
>
305-
<p
306-
class="pf-v6-c-content--p"
307-
data-ouia-component-id="ContentHeader-subtitle"
308-
data-ouia-component-type="PF6/Text"
309-
>>>>>>> 7d5bf1e (Update to PatternFly 6 (#145))
310-
<<<<<<< HEAD
311-
>>>>>>> e4d8972 (Update to PatternFly 6 (#145))
312-
=======
313-
=======
314-
=======
315-
>>>>>>> 34b69c4 (fix(v6): Fix generated files)
31637
<p
31738
class="pf-v6-c-content--p"
31839
data-ouia-component-id="ContentHeader-subtitle"
31940
data-ouia-component-type="PF6/Content"
320-
<<<<<<< HEAD
321-
>>>>>>> fbe8303 (Update to the latest PF versions (#224))
322-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
323-
=======
324-
>>>>>>> 34b69c4 (fix(v6): Fix generated files)
32541
data-ouia-safe="true"
32642
data-pf-content="true"
32743
>

‎packages/module/src/InvalidObject/__snapshots__/InvalidObject.test.tsx.snap‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -286,21 +286,11 @@ exports[`InvalidObject component should render 1`] = `
286286
data-ouia-safe="true"
287287
href="http://localhost:5000"
288288
>
289-
<<<<<<< HEAD
290-
<<<<<<< HEAD
291-
=======
292-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
293289
<span
294290
class="pf-v6-c-button__text"
295291
>
296292
Return to homepage
297293
</span>
298-
<<<<<<< HEAD
299-
=======
300-
Return to homepage
301-
>>>>>>> e4d8972 (Update to PatternFly 6 (#145))
302-
=======
303-
>>>>>>> 7e689b6 (Update to the latest PF versions (#224))
304294
</a>
305295
</div>
306296
</div>

0 commit comments

Comments
 (0)