Merge branch 'patternfly:main' into main

Author: wise-king-sullyman

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

@@ -1,16 +1,10 @@
-- uses: actions/setup-node@v1
+- uses: actions/setup-node@v4
   with:
-    node-version: "20"
-- uses: actions/cache@v2
-  id: yarn-cache
-  name: Load npm deps from cache
-  with:
-    path: "**/node_modules"
-    key: ${{ runner.os }}-yarn-14-${{ hashFiles('yarn.lock') }}
-- run: yarn install --frozen-lockfile
-  if: steps.yarn-cache.outputs.cache-hit != 'true'
+    node-version: 22
+- run: corepack enable
+- run: yarn install --immutable
 # v5 build
-- uses: actions/cache@v2
+- uses: actions/cache@v4
   id: site-cache
   name: Load webpack cache
   with:

.github/workflows/pr-preview.yml

@@ -16,19 +16,13 @@ jobs:
           git fetch origin pull/$GH_PR_NUM/head:tmp
           git checkout tmp
       # Injected by generate-workflows.js
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
-          node-version: "20"
-      - uses: actions/cache@v2
-        id: yarn-cache
-        name: Load  npm deps from cache
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-yarn-14-${{ hashFiles('yarn.lock') }}
-      - run: yarn install --frozen-lockfile
-        if: steps.yarn-cache.outputs.cache-hit != 'true'
+          node-version: 22
+      - run: corepack enable
+      - run: yarn install --immutable
       # build
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: site-cache
         name: Load webpack cache
         with:

.github/workflows/release.yml

@@ -19,19 +19,13 @@ jobs:
         with:
           token: ${{ secrets.GH_TOKEN_REDALLEN }} # needs to be an admin token to get around branch protection
       # Injected by generate-workflows.js
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
-          node-version: "20"
-      - uses: actions/cache@v2
-        id: yarn-cache
-        name: Load npm deps from cache
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-yarn-14-${{ hashFiles('yarn.lock') }}
-      - run: yarn install --frozen-lockfile
-        if: steps.yarn-cache.outputs.cache-hit != 'true'
+          node-version: 22
+      - run: corepack enable
+      - run: yarn install --immutable
       # v6 build
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: site-cache
         name: Load webpack cache
         with:

.gitignore

@@ -33,3 +33,13 @@ static
 
 size-plugin.json
 **/generated/**/*.js
+
+# Yarn
+# See: https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

README.md

@@ -4,9 +4,9 @@ The PatternFly Org is the source for the official documentation for PatternFly.
 
 ## Development
 
-Development setup requires yarn. If you do not already have yarn installed on your system, see https://yarnpkg.com/en/.
+Development setup requires yarn. If you do not already have yarn installed on your system, see https://yarnpkg.com/getting-started.
 
-A Node version greater than 18.16.0 is also required.
+A Node version 22 or greater is also required.
 
 ### Live Reload Server
 
@@ -28,8 +28,6 @@ The site can be built with:
 
 The static assets get copied to build/patternfly-org.
 
-If you see errors, make sure that the version of the `package.json` file in `packages/documentation-framework` matches the version of the `"@patternfly/documentation-framework"` dependency in the `package.json` file in `packages/documentation-site`.
-
 ### Deploy
 
 When you submit a PR, previews should be automatically generated for you and uploaded as PR comments. This takes between 5-10 minutes.

package.json

@@ -4,6 +4,7 @@
   "version": "0.0.1",
   "main": "index.js",
   "license": "MIT",
+  "packageManager": "[email protected]+sha512.3003a14012e2987072d244c720506549c1aab73ee728208f1b2580a9fd67b92d61ba6b08fe93f6dce68fd771e3af1e59a0afa28dd242dd0940d73b95fedd4e90",
   "scripts": {
     "analyze": "yarn workspace patternfly-org analyze",
     "develop": "yarn workspace patternfly-org develop",
@@ -24,25 +25,22 @@
   },
   "workspaces": {
     "packages": [
-      "packages/ast-helpers",
-      "packages/documentation-framework",
-      "packages/documentation-site"
+      "packages/*"
     ]
   },
   "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",
     "@octokit/rest": "^19.0.7",
+    "@patternfly/patternfly": "^6.1.0",
+    "@patternfly/react-code-editor": "^6.1.0",
+    "@patternfly/react-core": "^6.1.0",
+    "@patternfly/react-table": "^6.1.0",
     "glob": "^8.1.0",
     "lerna": "^6.4.1",
-    "surge": "^0.23.1",
     "react": "^18",
-    "react-dom": "^18"
+    "react-dom": "^18",
+    "surge": "^0.23.1"
   },
   "resolutions": {
     "node-sass": ">=6.0.1"
-  },
-  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  }
 }