Skip to content

Commit ae8abf3

Browse files
fhlavacInsaneZeindependabot[bot]
committed
fix(pf6): Rebase to the latest main (#259)
* add ServiceCard component (#200) * fix(readme): Update README.md (#257) * chore(deps-dev): bump @babel/preset-env from 7.24.8 to 7.25.3 (#254) Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.24.8 to 7.25.3. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.25.3/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump eslint from 8.41.0 to 8.57.0 (#253) Bumps [eslint](https://github.com/eslint/eslint) from 8.41.0 to 8.57.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v8.41.0...v8.57.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump readable-stream from 1.0.34 to 2.3.8 (#251) Bumps [readable-stream](https://github.com/nodejs/readable-stream) from 1.0.34 to 2.3.8. - [Release notes](https://github.com/nodejs/readable-stream/releases) - [Commits](nodejs/readable-stream@v1.0.34...v2.3.8) --- updated-dependencies: - dependency-name: readable-stream dependency-type: indirect update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump sax from 1.2.4 to 1.4.1 (#250) Bumps [sax](https://github.com/isaacs/sax-js) from 1.2.4 to 1.4.1. - [Commits](isaacs/sax-js@v1.2.4...v1.4.1) --- updated-dependencies: - dependency-name: sax dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump fast-glob from 3.2.12 to 3.3.2 (#249) Bumps [fast-glob](https://github.com/mrmlnc/fast-glob) from 3.2.12 to 3.3.2. - [Release notes](https://github.com/mrmlnc/fast-glob/releases) - [Commits](mrmlnc/fast-glob@3.2.12...3.3.2) --- updated-dependencies: - dependency-name: fast-glob dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @jridgewell/sourcemap-codec from 1.4.15 to 1.5.0 (#248) Bumps [@jridgewell/sourcemap-codec](https://github.com/jridgewell/sourcemap-codec) from 1.4.15 to 1.5.0. - [Release notes](https://github.com/jridgewell/sourcemap-codec/releases) - [Changelog](https://github.com/jridgewell/sourcemap-codec/blob/main/CHANGELOG.md) - [Commits](jridgewell/sourcemap-codec@v1.4.15...v1.5.0) --- updated-dependencies: - dependency-name: "@jridgewell/sourcemap-codec" dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump launch-editor from 2.8.0 to 2.8.1 (#247) Bumps [launch-editor](https://github.com/yyx990803/launch-editor) from 2.8.0 to 2.8.1. - [Commits](yyx990803/launch-editor@v2.8.0...v2.8.1) --- updated-dependencies: - dependency-name: launch-editor dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @types/eslint-scope from 3.7.4 to 3.7.7 (#246) Bumps [@types/eslint-scope](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/eslint-scope) from 3.7.4 to 3.7.7. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/eslint-scope) --- updated-dependencies: - dependency-name: "@types/eslint-scope" dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update to PatternFly 6 (#145) * Update to the latest PF versions (#224) * Update PF dependencies * Fix MCC colors * Replace not existing PF Text components * Update snapshots * fix(v6): Fix generated files * fix(v6): Fix TagCount styling (#237) * fix(v6): Fix TagCount styling * Update tokens * Update snapshots * fix(pf6): Update generated files * Remove extra padding * Remove unused import * Update README.md --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: InsaneZein <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 264f48b commit ae8abf3

File tree

4 files changed

+96
-104
lines changed

4 files changed

+96
-104
lines changed

‎package-lock.json‎

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

‎packages/module/patternfly-docs/content/extensions/component-groups/examples/ServiceCard/ServiceCardGalleryExample.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const ServiceCardGalleryExample: React.FunctionComponent = () => (
1818
/>
1919
</GalleryItem>
2020
<GalleryItem>
21-
<ServiceCard
21+
<ServiceCard
2222
isStacked
2323
title='Example2'
2424
subtitle='A second example'

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ exports[`PageHeader component should render 1`] = `
6666
>
6767
<h1
6868
class="pf-v6-c-content--h1 pf-v6-u-mb-sm"
69+
<<<<<<< HEAD:packages/module/src/PageHeader/__snapshots__/PageHeader.test.tsx.snap
6970
data-ouia-component-id="PageHeader-title"
71+
=======
72+
data-ouia-component-id="ContentHeader-title"
73+
>>>>>>> f902535 (fix(pf6): Rebase to the latest main (#259)):packages/module/src/ContentHeader/__snapshots__/ContentHeader.test.tsx.snap
7074
data-ouia-component-type="PF6/Content"
7175
data-ouia-safe="true"
7276
data-pf-content="true"
@@ -80,12 +84,20 @@ exports[`PageHeader component should render 1`] = `
8084
</div>
8185
<p
8286
class="pf-v6-c-content--p"
87+
<<<<<<< HEAD:packages/module/src/PageHeader/__snapshots__/PageHeader.test.tsx.snap
8388
data-ouia-component-id="PageHeader-subtitle"
89+
=======
90+
data-ouia-component-id="ContentHeader-subtitle"
91+
>>>>>>> f902535 (fix(pf6): Rebase to the latest main (#259)):packages/module/src/ContentHeader/__snapshots__/ContentHeader.test.tsx.snap
8492
data-ouia-component-type="PF6/Content"
8593
data-ouia-safe="true"
8694
data-pf-content="true"
8795
>
96+
<<<<<<< HEAD:packages/module/src/PageHeader/__snapshots__/PageHeader.test.tsx.snap
8897
This is a subtitle for your page header
98+
=======
99+
This is a subtitle for your content header
100+
>>>>>>> f902535 (fix(pf6): Rebase to the latest main (#259)):packages/module/src/ContentHeader/__snapshots__/ContentHeader.test.tsx.snap
89101
</p>
90102
</div>
91103
</div>

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

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`ServiceCard component should render ServiceCard component 1`] = `
3+
exports[`LogSnippet component should render LogSnippet component 1`] = `
44
{
55
"asFragment": [Function],
66
"baseElement": <body>
@@ -83,7 +83,11 @@ exports[`ServiceCard component should render ServiceCard component 1`] = `
8383
/
8484
</div>
8585
<div
86-
class=""
86+
class="pf-v6-c-content"
87+
data-ouia-component-id="OUIA-Generated-Content-1"
88+
data-ouia-component-type="PF6/Content"
89+
data-ouia-safe="true"
90+
data-pf-content="true"
8791
>
8892
<div
8993
class="pf-v6-c-content"
@@ -106,13 +110,68 @@ exports[`ServiceCard component should render ServiceCard component 1`] = `
106110
</div>
107111
</div>
108112
</div>
113+
<div
114+
class="pf-v6-c-card__body"
115+
data-ouia-component-id="ServiceCard-description"
116+
>
117+
This is a basic ServiceCard Example
118+
</div>
119+
<div
120+
class="pf-v6-c-card__footer"
121+
data-ouia-component-id="ServiceCard-footer"
122+
/>
123+
</div>
124+
</div>
125+
</body>,
126+
"container": <div>
127+
<div
128+
class="pf-v6-c-card card-0-2-1"
129+
data-ouia-component-id="ServiceCard-card"
130+
data-ouia-component-type="PF6/Card"
131+
data-ouia-safe="true"
132+
id=""
133+
>
134+
<div
135+
class="pf-v6-c-card__header"
136+
>
137+
<div
138+
class="pf-v6-c-card__header-main"
139+
>
140+
<div
141+
class="image-0-2-2"
142+
>
143+
/
144+
</div>
145+
<div
146+
class="pf-v6-c-content"
147+
data-ouia-component-id="OUIA-Generated-Content-1"
148+
data-ouia-component-type="PF6/Content"
149+
data-ouia-safe="true"
150+
data-pf-content="true"
151+
>
152+
<h2
153+
class="pf-v6-c-content--h2"
154+
data-ouia-component-id="ServiceCard-title"
155+
data-ouia-component-type="PF6/Content"
156+
data-ouia-safe="true"
157+
data-pf-content="true"
158+
>
159+
Example
160+
</h2>
161+
A basic example
162+
</div>
163+
</div>
109164
</div>
110165
<div
111166
class="pf-v6-c-card__body"
112167
data-ouia-component-id="ServiceCard-description"
113168
>
114169
This is a basic ServiceCard Example
115170
</div>
171+
<div
172+
class="pf-v6-c-card__footer"
173+
data-ouia-component-id="ServiceCard-footer"
174+
/>
116175
</div>
117176
</div>,
118177
"debug": [Function],

0 commit comments

Comments
 (0)