fixing conflicts.

.eslintignore

@@ -2,6 +2,7 @@
 node_modules
 dist
 __tests__
+thirdparty
 tsc_out
 .out
 .changelog

.eslintrc.json

@@ -106,9 +106,9 @@
             "never"
         ],
         "patternfly-react/import-tokens-icons": "error",
-        "patternfly-react/no-anonymous-functions": "error",
+        "patternfly-react/no-anonymous-functions": "off",
         "prefer-const": "error",
-        "prettier/prettier": "error",
+        "prettier/prettier": "off",
         "radix": [
             "error",
             "as-needed"

.github/release.sh

@@ -17,7 +17,7 @@ echo "Doing a release..."
 LOG=$(git log --format="%s" -1 | grep -Poe "#\d+")
 PR_NUM=${LOG:1}
 
-yarn run lerna publish --conventional-commits --create-release=github --no-verify-access --yes 2>&1 | tee lerna-output.txt
+yarn run lerna publish --conventional-commits --conventional-prerelease --create-release=github --no-verify-access --no-private --dist-tag=alpha --yes 2>&1 | tee lerna-output.txt
 
 if grep -i "Successfully published" lerna-output.txt; # Leave a Github comment
 then

.github/workflows-src/partials/dist.yml

@@ -4,7 +4,12 @@
   with:
     path: |
       packages/*/dist
+      packages/*/next
+      packages/*/deprecated
+      packages/*/components
       packages/react-styles/css
+      packages/react-core/layouts
+      packages/react-core/helpers
     key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
 - name: Build dist
   run: yarn build && yarn build:umd

.github/workflows/pr-preview.yml

@@ -35,7 +35,12 @@ jobs:
         with:
           path: |
             packages/*/dist
+            packages/*/next
+            packages/*/deprecated
+            packages/*/components
             packages/react-styles/css
+            packages/react-core/layouts
+            packages/react-core/helpers
           key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
       - name: Build dist
         run: yarn build && yarn build:umd
@@ -114,7 +119,12 @@ jobs:
         with:
           path: |
             packages/*/dist
+            packages/*/next
+            packages/*/deprecated
+            packages/*/components
             packages/react-styles/css
+            packages/react-core/layouts
+            packages/react-core/helpers
           key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
       - name: Build dist
         run: yarn build && yarn build:umd
@@ -158,7 +168,12 @@ jobs:
         with:
           path: |
             packages/*/dist
+            packages/*/next
+            packages/*/deprecated
+            packages/*/components
             packages/react-styles/css
+            packages/react-core/layouts
+            packages/react-core/helpers
           key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
       - name: Build dist
         run: yarn build && yarn build:umd
@@ -213,7 +228,12 @@ jobs:
         with:
           path: |
             packages/*/dist
+            packages/*/next
+            packages/*/deprecated
+            packages/*/components
             packages/react-styles/css
+            packages/react-core/layouts
+            packages/react-core/helpers
           key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
       - name: Build dist
         run: yarn build && yarn build:umd
@@ -264,7 +284,12 @@ jobs:
         with:
           path: |
             packages/*/dist
+            packages/*/next
+            packages/*/deprecated
+            packages/*/components
             packages/react-styles/css
+            packages/react-core/layouts
+            packages/react-core/helpers
           key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
       - name: Build dist
         run: yarn build && yarn build:umd

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: release
 on:
   push:
     branches:
-      - main
+      - v5
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -38,7 +38,12 @@ jobs:
         with:
           path: |
             packages/*/dist
+            packages/*/next
+            packages/*/deprecated
+            packages/*/components
             packages/react-styles/css
+            packages/react-core/layouts
+            packages/react-core/helpers
           key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
       - name: Build dist
         run: yarn build && yarn build:umd
@@ -117,7 +122,12 @@ jobs:
         with:
           path: |
             packages/*/dist
+            packages/*/next
+            packages/*/deprecated
+            packages/*/components
             packages/react-styles/css
+            packages/react-core/layouts
+            packages/react-core/helpers
           key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
       - name: Build dist
         run: yarn build && yarn build:umd
@@ -161,7 +171,12 @@ jobs:
         with:
           path: |
             packages/*/dist
+            packages/*/next
+            packages/*/deprecated
+            packages/*/components
             packages/react-styles/css
+            packages/react-core/layouts
+            packages/react-core/helpers
           key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
       - name: Build dist
         run: yarn build && yarn build:umd
@@ -216,7 +231,12 @@ jobs:
         with:
           path: |
             packages/*/dist
+            packages/*/next
+            packages/*/deprecated
+            packages/*/components
             packages/react-styles/css
+            packages/react-core/layouts
+            packages/react-core/helpers
           key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
       - name: Build dist
         run: yarn build && yarn build:umd
@@ -267,7 +287,12 @@ jobs:
         with:
           path: |
             packages/*/dist
+            packages/*/next
+            packages/*/deprecated
+            packages/*/components
             packages/react-styles/css
+            packages/react-core/layouts
+            packages/react-core/helpers
           key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
       - name: Build dist
         run: yarn build && yarn build:umd
@@ -316,7 +341,12 @@ jobs:
         with:
           path: |
             packages/*/dist
+            packages/*/next
+            packages/*/deprecated
+            packages/*/components
             packages/react-styles/css
+            packages/react-core/layouts
+            packages/react-core/helpers
           key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
       - name: Build dist
         run: yarn build && yarn build:umd

README.md

@@ -27,15 +27,14 @@ Using PatternFly 3?  Take a look at the [PatternFly 3 React component informatio
 |   [@patternfly/react-styles](./packages/react-styles/README.md) | PatternFly CSS styles |
 |   [@patternfly/react-tokens](./packages/react-tokens/README.md) | PatternFly CSS variable tokens |
 | **:yellow_heart: Extension packages** *UXD supported* |
-|   [@patternfly/react-log-viewer](./packages/react-log-viewer/README.md) | Virtualized log viewer component |
+|   [@patternfly/react-log-viewer](https://github.com/patternfly/react-log-viewer/README.md) | Virtualized log viewer component |
 | **:open_file_folder: Supporting packages** |
 |   [@patternfly/react-docs](./packages/react-docs/README.md) | Gatsby documentation site for components |
 |   [@patternfly/react-integration](./packages/react-integration/README.md) | Cypress integration tests |
 | **:family: Extension packages** *community supported* | 
 |   [@patternfly/react-catalog-view-extension](./packages/react-catalog-view-extension/README.md) | Catalog view extension |
 |   [@patternfly/react-virtualized-extension](./packages/react-virtualized-extension/README.md) | Table and list row virtualization extension |
 |   [@patternfly/react-topology](./packages/react-topology/README.md) | Topology components |
-|   [@patternfly/react-console](./packages/react-console/README.md) | Console components |
 | **:x: Deprecated packages** |
 |   [@patternfly/react-inline-edit-extension](./packages/react-inline-edit-extension/README.md) | Table inline edit extension |
 

lerna.json

@@ -25,5 +25,6 @@
     }
   },
   "version": "independent",
-  "useWorkspaces": true
-}
+  "useWorkspaces": true,
+  "allowBranch": ["main", "v5"]
+}