Skip to content

Commit

Permalink
Merge branch 'patternfly:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
wise-king-sullyman authored May 1, 2024
2 parents 68682c1 + 6a627ec commit 6c3f5ed
Show file tree
Hide file tree
Showing 33 changed files with 386 additions and 134 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ You might have a dirty file tree with old submodules and folders lying around. Y

git clean -dfx

### Contribute to HTML/CSS
### Contribute to HTML/CSS

To contribute to PatternFly's HTML/CSS core repo, refer to the [core contribution guide](https://github.com/patternfly/patternfly/blob/main/patternfly-docs/site/pages/contribution.md) and the related [guidelines](https://github.com/patternfly/patternfly/blob/main/patternfly-docs/site/pages/guidelines.md).
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
]
},
"devDependencies": {
"@patternfly/patternfly": "5.3.0-prerelease.5",
"@patternfly/react-code-editor": "5.3.0-prerelease.25",
"@patternfly/react-core": "5.3.0-prerelease.23",
"@patternfly/react-table": "5.3.0-prerelease.25",
"@patternfly/patternfly": "5.3.0",
"@patternfly/react-code-editor": "5.3.0",
"@patternfly/react-core": "5.3.0",
"@patternfly/react-table": "5.3.0",
"@octokit/rest": "^19.0.7",
"glob": "^8.1.0",
"lerna": "^6.4.1",
Expand Down
84 changes: 84 additions & 0 deletions packages/ast-helpers/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,90 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 1.13.3 (2024-04-24)

**Note:** Version bump only for package @patternfly/ast-helpers





## 1.13.2 (2024-04-23)

**Note:** Version bump only for package @patternfly/ast-helpers





## 1.13.1 (2024-04-23)

**Note:** Version bump only for package @patternfly/ast-helpers





# 1.13.0 (2024-04-18)


### Features

* **docs:** update release highlights with links ([#3972](https://github.com/patternfly/patternfly-org/issues/3972)) ([f5a9724](https://github.com/patternfly/patternfly-org/commit/f5a972493ffa34cdc36b53459cc55a206ee52330))





# 1.12.0 (2024-04-18)


### Features

* **org:** update to 5.3 release versions ([#3970](https://github.com/patternfly/patternfly-org/issues/3970)) ([08ee6c3](https://github.com/patternfly/patternfly-org/commit/08ee6c3fad9d0b5bf98f20b12530dd818ff66f9c))





# 1.11.0 (2024-04-17)


### Features

* **docs:** update screenshots ([#3969](https://github.com/patternfly/patternfly-org/issues/3969)) ([dff042b](https://github.com/patternfly/patternfly-org/commit/dff042b70a206d27990924673e360d908c01eac4))





## 1.10.3 (2024-04-17)


### Bug Fixes

* **docs:** proper commit ([#3968](https://github.com/patternfly/patternfly-org/issues/3968)) ([e4a09dd](https://github.com/patternfly/patternfly-org/commit/e4a09dd6905e7fa3acd1e536675942183f2d943d))





## 1.10.2 (2024-04-17)

**Note:** Version bump only for package @patternfly/ast-helpers





## 1.10.1 (2024-04-17)

**Note:** Version bump only for package @patternfly/ast-helpers





# 1.10.0 (2024-04-02)


Expand Down
2 changes: 1 addition & 1 deletion packages/ast-helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@patternfly/ast-helpers",
"description": "Acorn AST helpers for working with live code",
"version": "1.10.0",
"version": "1.13.3",
"author": "Red Hat",
"license": "MIT",
"publishConfig": {
Expand Down
84 changes: 84 additions & 0 deletions packages/documentation-framework/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,90 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 5.13.3 (2024-04-24)

**Note:** Version bump only for package @patternfly/documentation-framework





## 5.13.2 (2024-04-23)

**Note:** Version bump only for package @patternfly/documentation-framework





## 5.13.1 (2024-04-23)

**Note:** Version bump only for package @patternfly/documentation-framework





# 5.13.0 (2024-04-18)


### Features

* **docs:** update release highlights with links ([#3972](https://github.com/patternfly/patternfly-org/issues/3972)) ([f5a9724](https://github.com/patternfly/patternfly-org/commit/f5a972493ffa34cdc36b53459cc55a206ee52330))





# 5.12.0 (2024-04-18)


### Features

* **org:** update to 5.3 release versions ([#3970](https://github.com/patternfly/patternfly-org/issues/3970)) ([08ee6c3](https://github.com/patternfly/patternfly-org/commit/08ee6c3fad9d0b5bf98f20b12530dd818ff66f9c))





# 5.11.0 (2024-04-17)


### Features

* **docs:** update screenshots ([#3969](https://github.com/patternfly/patternfly-org/issues/3969)) ([dff042b](https://github.com/patternfly/patternfly-org/commit/dff042b70a206d27990924673e360d908c01eac4))





## 5.10.3 (2024-04-17)


### Bug Fixes

* **docs:** proper commit ([#3968](https://github.com/patternfly/patternfly-org/issues/3968)) ([e4a09dd](https://github.com/patternfly/patternfly-org/commit/e4a09dd6905e7fa3acd1e536675942183f2d943d))





## 5.10.2 (2024-04-17)

**Note:** Version bump only for package @patternfly/documentation-framework





## 5.10.1 (2024-04-17)

**Note:** Version bump only for package @patternfly/documentation-framework





# 5.10.0 (2024-04-02)


Expand Down
12 changes: 6 additions & 6 deletions packages/documentation-framework/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@patternfly/documentation-framework",
"description": "A framework to build documentation for PatternFly.",
"version": "5.10.0",
"version": "5.13.3",
"author": "Red Hat",
"license": "MIT",
"private": false,
Expand All @@ -13,7 +13,7 @@
"@babel/preset-env": "^7.24.3",
"@babel/preset-react": "^7.24.1",
"@mdx-js/util": "1.6.16",
"@patternfly/ast-helpers": "^1.10.0",
"@patternfly/ast-helpers": "^1.13.3",
"@reach/router": "npm:@gatsbyjs/[email protected]",
"autoprefixer": "9.8.6",
"babel-loader": "^9.1.3",
Expand Down Expand Up @@ -73,10 +73,10 @@
"webpack-merge": "5.8.0"
},
"peerDependencies": {
"@patternfly/patternfly": "5.3.0-prerelease.5",
"@patternfly/react-code-editor": "5.3.0-prerelease.25",
"@patternfly/react-core": "5.3.0-prerelease.23",
"@patternfly/react-table": "5.3.0-prerelease.25",
"@patternfly/patternfly": "5.3.0",
"@patternfly/react-code-editor": "5.3.0",
"@patternfly/react-core": "5.3.0",
"@patternfly/react-table": "5.3.0",
"react": "^17.0.0 || ^18.0.0",
"react-dom": "^17.0.0 || ^18.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/documentation-framework/templates/mdx.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const MDXChildTemplate = ({
You can find the <Link to={newImplementationLink}>updated implementation here</Link>.
</React.Fragment>
)}
{' '}To learn more about the process, visit our <Link to="/get-started/about#major-release-cadence">about page</Link>.
{' '}To learn more about the process, visit our <Link to="/get-started/about-patternfly#patternfly-release-cadence">about page</Link>.
</InlineAlert>
)}
{(template || source === 'react-template') && (
Expand Down
24 changes: 12 additions & 12 deletions packages/documentation-framework/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@
"date": "2024-04-02",
"latest": true,
"versions": {
"@patternfly/patternfly": "5.3.0-prerelease.5",
"@patternfly/react-charts": "7.3.0-prerelease.6",
"@patternfly/react-code-editor": "5.3.0-prerelease.25",
"@patternfly/react-core": "5.3.0-prerelease.23",
"@patternfly/react-icons": "5.3.0-prerelease.3",
"@patternfly/react-styles": "5.3.0-prerelease.3",
"@patternfly/react-table": "5.3.0-prerelease.25",
"@patternfly/react-drag-drop": "5.3.0-prerelease.23",
"@patternfly/react-tokens": "5.3.0-prerelease.3",
"@patternfly/patternfly": "5.3.0",
"@patternfly/react-charts": "7.3.0",
"@patternfly/react-code-editor": "5.3.0",
"@patternfly/react-core": "5.3.0",
"@patternfly/react-icons": "5.3.0",
"@patternfly/react-styles": "5.3.0",
"@patternfly/react-table": "5.3.0",
"@patternfly/react-drag-drop": "5.3.0",
"@patternfly/react-tokens": "5.3.0",
"@patternfly/react-catalog-view-extension": "5.0.0",
"@patternfly/react-component-groups": "5.1.0",
"@patternfly/react-console": "5.0.0",
"@patternfly/react-log-viewer": "5.2.0",
"@patternfly/react-topology": "5.3.0-prerelease.5",
"@patternfly/react-topology": "5.3.0",
"@patternfly/react-user-feedback": "5.0.0",
"@patternfly/react-virtualized-extension": "5.0.0",
"@patternfly/quickstarts": "5.3.0-prerelease.1",
"@patternfly/react-templates": "1.0.0-prerelease.6"
"@patternfly/quickstarts": "5.3.0",
"@patternfly/react-templates": "1.0.0"
}
},
{
Expand Down
8 changes: 4 additions & 4 deletions packages/documentation-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
"screenshots": "pf-docs-framework screenshots"
},
"dependencies": {
"@patternfly/documentation-framework": "^5.9.0",
"@patternfly/quickstarts": "^5.3.0-prerelease.1",
"@patternfly/documentation-framework": "^5.11.0",
"@patternfly/quickstarts": "5.3.0",
"@patternfly/react-catalog-view-extension": "5.0.0",
"@patternfly/react-console": "5.0.0",
"@patternfly/react-docs": "6.3.0-prerelease.31",
"@patternfly/react-docs": "6.3.0",
"@patternfly/react-log-viewer": "5.1.0",
"@patternfly/react-topology": "5.3.0-prerelease.5",
"@patternfly/react-topology": "5.3.0",
"@patternfly/react-user-feedback": "5.0.0",
"@patternfly/react-component-groups": "5.1.0",
"@patternfly/react-virtualized-extension": "5.0.0",
Expand Down
Loading

0 comments on commit 6c3f5ed

Please sign in to comment.