Merge branch 'main' into issue-4404

patternfly · Dec 9, 2024 · 68b723b · 68b723b
2 parents 823c4d7 + b4be0bf
commit 68b723b
Show file tree

Hide file tree

Showing 11 changed files with 406 additions and 388 deletions.
diff --git a/package.json b/package.json
@@ -30,10 +30,10 @@
     ]
   },
   "devDependencies": {
-    "@patternfly/patternfly": "^6.1.0-prerelease.2",
-    "@patternfly/react-code-editor": "^6.0.0",
-    "@patternfly/react-core": "^6.1.0-prerelease.2",
-    "@patternfly/react-table": "^6.0.0",
+    "@patternfly/patternfly": "^6.1.0-prerelease.11",
+    "@patternfly/react-code-editor": "^6.1.0-prerelease.14",
+    "@patternfly/react-core": "^6.1.0-prerelease.14",
+    "@patternfly/react-table": "^6.1.0-prerelease.14",
     "@octokit/rest": "^19.0.7",
     "glob": "^8.1.0",
     "lerna": "^6.4.1",

diff --git a/packages/ast-helpers/CHANGELOG.md b/packages/ast-helpers/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.4.0-alpha.134 (2024-12-09)
+
+
+### Features
+
+* **ver:** update to 6.1 prerelease versions ([#4405](https://github.com/patternfly/patternfly-org/issues/4405)) ([8f9dd5e](https://github.com/patternfly/patternfly-org/commit/8f9dd5edc4c907f5b170e24a1d99d66a79c5eca5))
+
+
+
+
+
 # 1.4.0-alpha.133 (2024-12-09)
 
 

diff --git a/packages/ast-helpers/package.json b/packages/ast-helpers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@patternfly/ast-helpers",
   "description": "Acorn AST helpers for working with live code",
-  "version": "1.4.0-alpha.133",
+  "version": "1.4.0-alpha.134",
   "author": "Red Hat",
   "license": "MIT",
   "publishConfig": {

diff --git a/packages/documentation-framework/CHANGELOG.md b/packages/documentation-framework/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 6.1.0 (2024-12-09)
+
+
+### Features
+
+* **ver:** update to 6.1 prerelease versions ([#4405](https://github.com/patternfly/patternfly-org/issues/4405)) ([8f9dd5e](https://github.com/patternfly/patternfly-org/commit/8f9dd5edc4c907f5b170e24a1d99d66a79c5eca5))
+
+
+
+
+
 ## 6.0.17 (2024-12-09)
 
 

diff --git a/packages/documentation-framework/package.json b/packages/documentation-framework/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@patternfly/documentation-framework",
   "description": "A framework to build documentation for PatternFly.",
-  "version": "6.0.17",
+  "version": "6.1.0",
   "author": "Red Hat",
   "license": "MIT",
   "private": false,
@@ -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.4.0-alpha.133",
+    "@patternfly/ast-helpers": "^1.4.0-alpha.134",
     "@reach/router": "npm:@gatsbyjs/[email protected]",
     "autoprefixer": "9.8.6",
     "babel-loader": "^9.1.3",
@@ -73,10 +73,10 @@
     "webpack-merge": "5.8.0"
   },
   "peerDependencies": {
-    "@patternfly/patternfly": "^6.1.0-prerelease.2",
-    "@patternfly/react-code-editor": "^6.0.0",
-    "@patternfly/react-core": "^6.1.0-prerelease.2",
-    "@patternfly/react-table": "^6.0.0",
+    "@patternfly/patternfly": "^6.1.0-prerelease.11",
+    "@patternfly/react-code-editor": "^6.1.0-prerelease.14",
+    "@patternfly/react-core": "^6.1.0-prerelease.14",
+    "@patternfly/react-table": "^6.1.0-prerelease.14",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
   }

diff --git a/packages/documentation-framework/versions.json b/packages/documentation-framework/versions.json
@@ -1,9 +1,34 @@
 {
   "Releases": [
     {
+      "name": "6.1.0",
+      "date": "2024-12-5",
+      "latest": true,
+      "versions": {
+        "@patternfly/patternfly": "6.1.0-prerelease.11",
+        "@patternfly/react-catalog-view-extension": "6.0.0",
+        "@patternfly/react-charts": "8.1.0-prerelease.17",
+        "@patternfly/react-code-editor": "6.1.0-prerelease.14",
+        "@patternfly/react-component-groups": "6.1.0-prerelease.3",
+        "@patternfly/react-core": "6.1.0-prerelease.14",
+        "@patternfly/react-drag-drop": "6.1.0-prerelease.14",
+        "@patternfly/react-icons": "6.1.0-prerelease.6",
+        "@patternfly/react-log-viewer": "6.1.0-prerelease.1",
+        "@patternfly/react-styles": "6.1.0-prerelease.5",
+        "@patternfly/react-table": "6.1.0-prerelease.14",
+        "@patternfly/react-tokens": "6.1.0-prerelease.5",
+        "@patternfly/react-topology": "6.1.0-prerelease.3",
+        "@patternfly/react-user-feedback": "6.0.0",
+        "@patternfly/react-console": "6.0.0",
+        "@patternfly/quickstarts": "6.1.0-prerelease.6",
+        "@patternfly/react-virtualized-extension": "6.0.0",
+        "@patternfly/react-templates": "6.1.0-prerelease.14",
+        "@patternfly/chatbot": "2.1.0-prerelease.26"
+      }
+    },{
       "name": "6.0.0",
       "date": "2024-10-30",
-      "latest": true,
+      "hidden": true,
       "versions": {
         "@patternfly/patternfly": "6.0.0",
         "@patternfly/react-catalog-view-extension": "6.0.0",

diff --git a/packages/documentation-site/package.json b/packages/documentation-site/package.json
@@ -20,14 +20,14 @@
     "@patternfly/documentation-framework": "6.0.17",
     "@patternfly/react-catalog-view-extension": "6.0.0",
     "@patternfly/react-console": "6.0.0",
-    "@patternfly/react-docs": "7.1.0-prerelease.7",
-    "@patternfly/react-log-viewer": "6.0.0",
-    "@patternfly/react-topology": "6.0.1",
+    "@patternfly/react-docs": "7.1.0-prerelease.23",
+    "@patternfly/react-log-viewer": "6.1.0-prerelease.1",
+    "@patternfly/react-topology": "6.1.0-prerelease.3",
     "@patternfly/react-user-feedback": "6.0.0",
-    "@patternfly/react-component-groups": "6.0.0",
+    "@patternfly/react-component-groups": "6.1.0-prerelease.3",
     "@patternfly/react-virtualized-extension": "6.0.0",
-    "@patternfly/quickstarts": "6.0.0",
-    "@patternfly/virtual-assistant": "2.0.2",
+    "@patternfly/quickstarts": "6.1.0-prerelease.6",
+    "@patternfly/chatbot": "2.1.0-prerelease.26",
     "@patternfly/design-tokens": "1.13.0",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0",

diff --git a/packages/documentation-site/patternfly-docs/pages/featured-posts-data.js b/packages/documentation-site/patternfly-docs/pages/featured-posts-data.js
@@ -9,13 +9,13 @@ export const featuredPostsData = {
       "https://miro.medium.com/v2/resize:fit:600/format:webp/1*FOVVqeJPmsoM6uJqsZHXZA.png",
   },
   post2: {
-    title: "UX writing mistakes as horror movie archetypes",
-    author: "Katie Edwards",
-    length: "3 min read",
-    URL: "https://medium.com/patternfly/ux-writing-mistakes-as-horror-movie-archetypes-7c30705762ae",
+    title: "From UX design to code",
+    author: "Tina Yip",
+    length: "10 min read",
+    URL: "https://medium.com/patternfly/from-ux-design-to-code-80af8291b04a",
     // Use resize:fit:600 in URL
     imageURL:
-      "https://miro.medium.com/v2/resize:fit:600/format:webp/1*TFIZCRKz6CbrLWMwBEOu_Q.png",
+      "https://miro.medium.com/v2/resize:fit:600/format:webp/0*9CY4zONMQaeU_-Z-",
   },
   post3: {
     title:

diff --git a/packages/documentation-site/patternfly-docs/patternfly-docs.css.js b/packages/documentation-site/patternfly-docs/patternfly-docs.css.js
@@ -1,22 +1,22 @@
 // React-specific CSS
-import "@patternfly/react-styles/src/css/components/Table/inline-edit.css"; // inline-edit extension styles
-import "@patternfly/react-styles/src/css/layouts/Toolbar/toolbar.css";
+import '@patternfly/react-styles/src/css/components/Table/inline-edit.css'; // inline-edit extension styles
+import '@patternfly/react-styles/src/css/layouts/Toolbar/toolbar.css';
 
 // Patternfly
-import "@patternfly/patternfly/patternfly.css";
+import '@patternfly/patternfly/patternfly.css';
 // Patternfly utilities
-import "@patternfly/patternfly/patternfly-addons.css";
+import '@patternfly/patternfly/patternfly-addons.css';
 // Global theme CSS
-import "@patternfly/documentation-framework/global.css";
+import '@patternfly/documentation-framework/global.css';
 // Patternfly topology
-import "@patternfly/react-topology/src/css/topology-controlbar.css";
-import "@patternfly/react-topology/src/css/topology-side-bar.css";
-import "@patternfly/react-topology/src/css/topology-view.css";
-import "@patternfly/react-topology/src/css/topology-components.css";
-import "@patternfly/react-topology/src/css/topology-pipelines.css";
+import '@patternfly/react-topology/src/css/topology-controlbar.css';
+import '@patternfly/react-topology/src/css/topology-side-bar.css';
+import '@patternfly/react-topology/src/css/topology-view.css';
+import '@patternfly/react-topology/src/css/topology-components.css';
+import '@patternfly/react-topology/src/css/topology-pipelines.css';
 // Patternfly log viewer
-import "@patternfly/react-log-viewer/src/LogViewer/css/log-viewer.css";
+import '@patternfly/react-log-viewer/src/LogViewer/css/log-viewer.css';
 // Patternfly user feedback
-import "@patternfly/react-user-feedback/src/Feedback/Feedback.css";
-// Patternfly virtual assistant
-import '@patternfly/virtual-assistant/dist/css/main.css';
+import '@patternfly/react-user-feedback/src/Feedback/Feedback.css';
+// Patternfly chatbot
+import '@patternfly/chatbot/dist/css/main.css';
diff --git a/packages/documentation-site/patternfly-docs/patternfly-docs.source.js b/packages/documentation-site/patternfly-docs/patternfly-docs.source.js
@@ -242,16 +242,16 @@ module.exports = (sourceMD, sourceProps, sourceFunctionDocs) => {
     "design-guidelines"
   );
 
-  // Virtual assistant (aka Chatbot)
+  // Chatbot
   const virtualAssistantPath = require
-    .resolve("@patternfly/virtual-assistant/package.json")
+    .resolve("@patternfly/chatbot/package.json")
     .replace("package.json", "src");
 
   const virtualAssistantBase = require
-    .resolve("@patternfly/virtual-assistant/package.json")
+    .resolve("@patternfly/chatbot/package.json")
     .replace(
       "package.json",
-      "patternfly-docs/content/extensions/virtual-assistant"
+      "patternfly-docs/content/extensions/chatbot"
     );
 
   sourceProps(