Rebase v6

.github/workflows/pr-preview.yml

@@ -15,10 +15,10 @@ jobs:
           git fetch origin pull/$GH_PR_NUM/head:tmp
           git checkout tmp
       - run: |
-          git rev-parse origin/main
+          git rev-parse origin/v6
           git rev-parse HEAD
-          git rev-parse origin/main..HEAD
-          git log origin/main..HEAD --format="%b"
+          git rev-parse origin/v6..HEAD
+          git log origin/v6..HEAD --format="%b"
       # Yes, we really want to checkout the PR
       # Injected by generate-workflows.js
       - uses: actions/setup-node@v1

package.json

@@ -29,9 +29,9 @@
     "@babel/preset-typescript": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.21.0",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@testing-library/react":"^13.4.0",
+    "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "14.4.3",
-    "@testing-library/jest-dom":"5.16.5",
+    "@testing-library/jest-dom": "5.16.5",
     "@testing-library/dom": "9.0.0",
     "@typescript-eslint/eslint-plugin": "^5.42.0",
     "@typescript-eslint/parser": "^5.42.0",
@@ -51,12 +51,18 @@
     "eslint-plugin-patternfly-react": "^4.80.4",
     "jest": "^29.2.2",
     "jest-environment-jsdom": "^29.2.2",
+    "jest-transform-stub": "^2.0.0",
     "prettier": "2.7.1",
     "react": "^18",
     "react-dom": "^18",
+    "react-error-overlay": "6.0.9",
     "serve": "^14.1.2",
     "surge": "^0.23.1",
     "typedoc": "0.23",
     "@types/react": "^18"
+  },
+  "resolutions": {
+    "@types/react": "^18",
+    "react-error-overlay": "6.0.9"
   }
 }

packages/module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-topology",
-  "version": "0.0.0",
+  "version": "6.0.0-alpha.0",
   "description": "Provide patternfly components, styles, and utilities for displaying a topology view",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -30,12 +30,12 @@
   "homepage": "https://github.com/patternfly/react-topology#readme",
   "publishConfig": {
     "access": "public",
-    "tag": "prerelease"
+    "tag": "alpha"
   },
   "dependencies": {
-    "@patternfly/react-core": "^5.1.1",
-    "@patternfly/react-icons": "^5.1.1",
-    "@patternfly/react-styles": "^5.1.1",
+    "@patternfly/react-core": "6.0.0-alpha.50",
+    "@patternfly/react-icons": "6.0.0-alpha.19",
+    "@patternfly/react-styles": "6.0.0-alpha.19",
     "@types/d3": "^7.4.0",
     "@types/d3-force": "^1.2.1",
     "@types/dagre": "0.7.42",
@@ -55,11 +55,11 @@
     "react-dom": "^17 || ^18"
   },
   "devDependencies": {
-    "@patternfly/documentation-framework": "^5.2.15",
-    "@patternfly/patternfly": "^5.1.0",
+    "@patternfly/documentation-framework": "^6.0.0-alpha.25",
+    "@patternfly/patternfly": "6.0.0-alpha.117",
+    "@patternfly/react-table": "6.0.0-alpha.50",
     "@patternfly/patternfly-a11y": "^4.3.1",
-    "@patternfly/react-code-editor": "^5.1.1",
-    "@patternfly/react-table": "^5.1.1",
+    "@patternfly/react-code-editor": "6.0.0-alpha.50",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "camel-case": "^3.0.0",
@@ -72,6 +72,7 @@
     "rimraf": "^2.6.2",
     "typescript": "^4.7.4",
     "react-monaco-editor": "^0.51.0",
+    "react-error-overlay": "6.0.9",
     "monaco-editor": "^0.34.1"
   }
 }

packages/module/patternfly-docs/generated/index.js

@@ -1,75 +1,74 @@
 module.exports = {
-  '/topology/anchors/extensions': {
-    id: "Anchors",
-    title: "Anchors",
-    toc: [[{"text":"Using custom anchors"}]],
-    examples: ["Using custom anchors"],
+  '/topology/toolbar/extensions': {
+    id: "Toolbar",
+    title: "Toolbar",
+    toc: [[{"text":"Topology with a toolbar"}]],
+    examples: ["Topology with a toolbar"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    sortValue: 13,
-    Component: () => import(/* webpackChunkName: "topology/anchors/extensions/index" */ './topology/anchors/extensions')
+    sortValue: 32,
+    Component: () => import(/* webpackChunkName: "topology/toolbar/extensions/index" */ './topology/toolbar/extensions')
   },
-  '/topology/context-menu/extensions': {
-    id: "Context Menu",
-    title: "Context Menu",
-    toc: [[{"text":"Topology with context menus"}]],
-    examples: ["Topology with context menus"],
+  '/topology/sidebar/extensions': {
+    id: "Sidebar",
+    title: "Sidebar",
+    toc: [[{"text":"Topology with a side bar"}]],
+    examples: ["Topology with a side bar"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    sortValue: 23,
-    Component: () => import(/* webpackChunkName: "topology/context-menu/extensions/index" */ './topology/context-menu/extensions')
+    sortValue: 33,
+    Component: () => import(/* webpackChunkName: "topology/sidebar/extensions/index" */ './topology/sidebar/extensions')
   },
-  '/topology/control-bar/extensions': {
-    id: "Control Bar",
-    title: "Control Bar",
-    toc: [[{"text":"Topology with a control bar"}]],
-    examples: ["Topology with a control bar"],
+  '/topology/selection/extensions': {
+    id: "Selection",
+    title: "Selection",
+    toc: [[{"text":"Using selection"}]],
+    examples: ["Using selection"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    sortValue: 31,
-    Component: () => import(/* webpackChunkName: "topology/control-bar/extensions/index" */ './topology/control-bar/extensions')
+    sortValue: 21,
+    Component: () => import(/* webpackChunkName: "topology/selection/extensions/index" */ './topology/selection/extensions')
   },
-  '/topology/custom-edges/extensions': {
-    id: "Custom Edges",
-    title: "Custom Edges",
-    toc: [[{"text":"Using custom edges"}]],
-    examples: ["Using custom edges"],
+  '/topology/pipelines/extensions': {
+    id: "Pipelines",
+    title: "Pipelines",
+    toc: [[{"text":"Getting Started with Topology Pipelines"}],{"text":"Functions"},[{"text":"getSpacerNodes"},{"text":"getEdgesFromNodes"}]],
+    examples: ["Getting Started with Topology Pipelines"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    sortValue: 12,
-    Component: () => import(/* webpackChunkName: "topology/custom-edges/extensions/index" */ './topology/custom-edges/extensions')
+    sortValue: 71,
+    Component: () => import(/* webpackChunkName: "topology/pipelines/extensions/index" */ './topology/pipelines/extensions')
   },
-  '/topology/custom-nodes/extensions': {
-    id: "Custom Nodes",
-    title: "Custom Nodes",
-    toc: [[{"text":"Using custom nodes"}]],
-    examples: ["Using custom nodes"],
+  '/topology/panzoom/extensions': {
+    id: "Pan/Zoom",
+    title: "Pan/Zoom",
+    toc: [[{"text":"Providing pan and zoom on the graph"}]],
+    examples: ["Providing pan and zoom on the graph"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    sortValue: 11,
-    Component: () => import(/* webpackChunkName: "topology/custom-nodes/extensions/index" */ './topology/custom-nodes/extensions')
+    sortValue: 22,
+    Component: () => import(/* webpackChunkName: "topology/panzoom/extensions/index" */ './topology/panzoom/extensions')
   },
-  '/topology/drag-and-drop/extensions': {
-    id: "Drag and Drop",
-    title: "Drag and Drop",
-    toc: [[{"text":"Drag and Drop"}],{"text":"Functions"},[{"text":"withDragNode"},{"text":"withSourceDrag"},{"text":"withTargetDrag"},{"text":"withDndDrop"}]],
-    examples: ["Drag and Drop"],
+  '/topology/layouts/extensions': {
+    id: "Layouts",
+    title: "Layouts",
+    toc: [[{"text":"Layouts"},{"text":"Examples"}]],
+    examples: ["Examples"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    sortValue: 24,
-    Component: () => import(/* webpackChunkName: "topology/drag-and-drop/extensions/index" */ './topology/drag-and-drop/extensions')
+    Component: () => import(/* webpackChunkName: "topology/layouts/extensions/index" */ './topology/layouts/extensions')
   },
   '/topology/getting-started/extensions': {
     id: "Getting started",
@@ -83,75 +82,76 @@ module.exports = {
     sortValue: 1,
     Component: () => import(/* webpackChunkName: "topology/getting-started/extensions/index" */ './topology/getting-started/extensions')
   },
-  '/topology/layouts/extensions': {
-    id: "Layouts",
-    title: "Layouts",
-    toc: [[{"text":"Layouts"},{"text":"Examples"}]],
-    examples: ["Examples"],
+  '/topology/drag-and-drop/extensions': {
+    id: "Drag and Drop",
+    title: "Drag and Drop",
+    toc: [[{"text":"Drag and Drop"}],{"text":"Functions"},[{"text":"withDragNode"},{"text":"withSourceDrag"},{"text":"withTargetDrag"},{"text":"withDndDrop"}]],
+    examples: ["Drag and Drop"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    Component: () => import(/* webpackChunkName: "topology/layouts/extensions/index" */ './topology/layouts/extensions')
+    sortValue: 24,
+    Component: () => import(/* webpackChunkName: "topology/drag-and-drop/extensions/index" */ './topology/drag-and-drop/extensions')
   },
-  '/topology/panzoom/extensions': {
-    id: "Pan/Zoom",
-    title: "Pan/Zoom",
-    toc: [[{"text":"Providing pan and zoom on the graph"}]],
-    examples: ["Providing pan and zoom on the graph"],
+  '/topology/custom-nodes/extensions': {
+    id: "Custom Nodes",
+    title: "Custom Nodes",
+    toc: [[{"text":"Using custom nodes"}]],
+    examples: ["Using custom nodes"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    sortValue: 22,
-    Component: () => import(/* webpackChunkName: "topology/panzoom/extensions/index" */ './topology/panzoom/extensions')
+    sortValue: 11,
+    Component: () => import(/* webpackChunkName: "topology/custom-nodes/extensions/index" */ './topology/custom-nodes/extensions')
   },
-  '/topology/pipelines/extensions': {
-    id: "Pipelines",
-    title: "Pipelines",
-    toc: [[{"text":"Getting Started with Topology Pipelines"}],{"text":"Functions"},[{"text":"getSpacerNodes"},{"text":"getEdgesFromNodes"}]],
-    examples: ["Getting Started with Topology Pipelines"],
+  '/topology/custom-edges/extensions': {
+    id: "Custom Edges",
+    title: "Custom Edges",
+    toc: [[{"text":"Using custom edges"}]],
+    examples: ["Using custom edges"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    sortValue: 71,
-    Component: () => import(/* webpackChunkName: "topology/pipelines/extensions/index" */ './topology/pipelines/extensions')
+    sortValue: 12,
+    Component: () => import(/* webpackChunkName: "topology/custom-edges/extensions/index" */ './topology/custom-edges/extensions')
   },
-  '/topology/selection/extensions': {
-    id: "Selection",
-    title: "Selection",
-    toc: [[{"text":"Using selection"}]],
-    examples: ["Using selection"],
+  '/topology/control-bar/extensions': {
+    id: "Control Bar",
+    title: "Control Bar",
+    toc: [[{"text":"Topology with a control bar"}]],
+    examples: ["Topology with a control bar"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    sortValue: 21,
-    Component: () => import(/* webpackChunkName: "topology/selection/extensions/index" */ './topology/selection/extensions')
+    sortValue: 31,
+    Component: () => import(/* webpackChunkName: "topology/control-bar/extensions/index" */ './topology/control-bar/extensions')
   },
-  '/topology/sidebar/extensions': {
-    id: "Sidebar",
-    title: "Sidebar",
-    toc: [[{"text":"Topology with a side bar"}]],
-    examples: ["Topology with a side bar"],
+  '/topology/context-menu/extensions': {
+    id: "Context Menu",
+    title: "Context Menu",
+    toc: [[{"text":"Topology with context menus"}]],
+    examples: ["Topology with context menus"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    sortValue: 33,
-    Component: () => import(/* webpackChunkName: "topology/sidebar/extensions/index" */ './topology/sidebar/extensions')
+    sortValue: 23,
+    Component: () => import(/* webpackChunkName: "topology/context-menu/extensions/index" */ './topology/context-menu/extensions')
   },
-  '/topology/toolbar/extensions': {
-    id: "Toolbar",
-    title: "Toolbar",
-    toc: [[{"text":"Topology with a toolbar"}]],
-    examples: ["Topology with a toolbar"],
+  '/topology/anchors/extensions': {
+    id: "Anchors",
+    title: "Anchors",
+    toc: [[{"text":"Using custom anchors"}]],
+    examples: ["Using custom anchors"],
     section: "topology",
     subsection: "",
     source: "extensions",
     tabName: null,
-    sortValue: 32,
-    Component: () => import(/* webpackChunkName: "topology/toolbar/extensions/index" */ './topology/toolbar/extensions')
+    sortValue: 13,
+    Component: () => import(/* webpackChunkName: "topology/anchors/extensions/index" */ './topology/anchors/extensions')
   }
 };