Updated main branch with v6 migration changes.

evwilkin · Sep 5, 2024 · 35a8f33 · 35a8f33
1 parent e747483
commit 35a8f33
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 35 deletions.
diff --git a/.github/release.sh b/.github/release.sh
@@ -20,7 +20,7 @@ PR_NUM=${LOG:1}
 #yarn run lerna publish prerelease --preid=prerelease --dist-tag=prerelease --yes 2>&1 | tee lerna-output.txt
 
 # use lerna command below for dry run
-yarn run lerna version prerelease --preid=prerelease --dist-tag=prerelease --yes --no-git-tag-version --no-push | tee lerna-output.txt
+yarn run lerna version prerelease --preid=prerelease --yes --no-git-tag-version --no-push | tee lerna-output.txt
 
 if grep -i "Successfully published" lerna-output.txt; # Leave a Github comment
 then

diff --git a/.github/renovate.json b/.github/renovate.json
@@ -12,5 +12,5 @@
       "enabled": false
     }
   ],
-  "baseBranches": ["main", "v6"]
+  "baseBranches": ["main", "v5"]
 }
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Release
 on:
   push:
     branches:
-      - v6
+      - main
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true

diff --git a/lerna.json b/lerna.json
@@ -24,7 +24,7 @@
     }
   },
   "version": "independent",
-  "allowBranch": ["main", "v4", "5.0.x", "v6"],
+  "allowBranch": ["main", "v4", "5.0.x", "v5"],
   "packages": ["packages/*", "packages/react-integration/demo-app-ts"],
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
diff --git a/packages/eslint-plugin-patternfly-react/package.json b/packages/eslint-plugin-patternfly-react/package.json
@@ -1,11 +1,11 @@
 {
   "name": "eslint-plugin-patternfly-react",
-  "version": "5.2.0-alpha.7",
+  "version": "6.0.0-prerelase.0",
   "main": "./lib/index.js",
   "license": "MIT",
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "prerelease"
   },
   "repository": {
     "type": "git",

diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-charts",
-  "version": "8.0.0-alpha.39",
+  "version": "8.0.0-prerelease.0",
   "description": "This library provides a set of React chart components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -12,7 +12,7 @@
   ],
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "prerelase"
   },
   "repository": {
     "type": "git",

diff --git a/packages/react-code-editor/package.json b/packages/react-code-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-code-editor",
-  "version": "6.0.0-alpha.106",
+  "version": "6.0.0-prerelease.0",
   "description": "This package provides a PatternFly wrapper for the Monaco code editor\n",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -9,7 +9,7 @@
   "sideEffects": false,
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "prerelease"
   },
   "repository": {
     "type": "git",

diff --git a/packages/react-core/package.json b/packages/react-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "6.0.0-alpha.106",
+  "version": "6.0.0-prerelease.0",
   "description": "This library provides a set of common React components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -22,7 +22,7 @@
   ],
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "prerelease"
   },
   "repository": {
     "type": "git",
@@ -54,7 +54,7 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.0.0-alpha.210",
+    "@patternfly/patternfly": "6.0.0-prerelease.210",
     "case-anything": "^2.1.13",
     "css": "^3.0.0",
     "fs-extra": "^11.2.0"

diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@patternfly/react-docs",
   "description": "PatternFly React Docs",
-  "version": "7.0.0-alpha.114",
+  "version": "7.0.0-prerelease.0",
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "prerelease"
   },
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "test:a11y": "patternfly-a11y --config patternfly-a11y.config"
   },
   "dependencies": {
-    "@patternfly/patternfly": "6.0.0-alpha.210",
+    "@patternfly/patternfly": "6.0.0-prerelease.210",
     "@patternfly/react-charts": "workspace:^",
     "@patternfly/react-code-editor": "workspace:^",
     "@patternfly/react-core": "workspace:^",
@@ -35,7 +35,7 @@
     "@patternfly/react-tokens": "workspace:^"
   },
   "devDependencies": {
-    "@patternfly/documentation-framework": "^6.0.0-alpha.66",
+    "@patternfly/documentation-framework": "^6.0.0-prerelease.66",
     "@patternfly/patternfly-a11y": "4.3.1"
   },
   "keywords": [

diff --git a/packages/react-drag-drop/package.json b/packages/react-drag-drop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-drag-drop",
-  "version": "6.0.0-alpha.88",
+  "version": "6.0.0-prerelease.0",
   "description": "PatternFly drag and drop solution",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@patternfly/react-icons",
-  "version": "6.0.0-alpha.37",
+  "version": "6.0.0-prerelease.0",
   "description": "PatternFly 4 Icons as React Components",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
   "sideEffects": false,
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "prerelease"
   },
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.4",
     "@fortawesome/free-regular-svg-icons": "^5.15.4",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@patternfly/patternfly": "6.0.0-alpha.210",
+    "@patternfly/patternfly": "6.0.0-prerelease.210",
     "fs-extra": "^11.2.0",
     "tslib": "^2.6.2"
   },

diff --git a/packages/react-integration/demo-app-ts/package.json b/packages/react-integration/demo-app-ts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "demo-app-ts",
   "private": true,
-  "version": "5.1.1-alpha.105",
+  "version": "6.0.0-prerelease.0",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",

diff --git a/packages/react-integration/package.json b/packages/react-integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-integration",
-  "version": "6.0.0-alpha.51",
+  "version": "6.0.0-prerelease.0",
   "private": true,
   "description": "Integration testing for PF5 using demo applications",
   "main": "lib/index.js",

diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-styles",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-prerelease.0",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
@@ -12,14 +12,14 @@
   "author": "Red Hat",
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "prerelease"
   },
   "scripts": {
     "generate": "rimraf css && node scripts/writeClassMaps.mjs && node scripts/copyStyles.mjs",
     "clean": "rimraf dist css"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.0.0-alpha.210",
+    "@patternfly/patternfly": "6.0.0-prerelease.0",
     "change-case": "^5.4.4",
     "fs-extra": "^11.2.0"
   },

diff --git a/packages/react-table/package.json b/packages/react-table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-table",
-  "version": "6.0.0-alpha.107",
+  "version": "6.0.0-prerelease.0",
   "description": "This library provides a set of React table components for use with the PatternFly 4",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -16,7 +16,7 @@
   "sideEffects": false,
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "prerelease"
   },
   "repository": {
     "type": "git",

diff --git a/packages/react-templates/package.json b/packages/react-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-templates",
-  "version": "6.0.0-alpha.56",
+  "version": "6.0.0-prerelease.0",
   "description": "This package provides wrapped component demos for ease of use\n",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -9,7 +9,7 @@
   "sideEffects": false,
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "prerelease"
   },
   "repository": {
     "type": "git",

diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@patternfly/react-tokens",
-  "version": "6.0.0-alpha.36",
+  "version": "6.0.0-prerelease.0",
   "description": "This library provides access to the design tokens of PatternFly 4 from JavaScript",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
   "sideEffects": false,
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "prerelease"
   },
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "clean": "rimraf dist"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.0.0-alpha.210",
+    "@patternfly/patternfly": "6.0.0-prerelease.0",
     "css": "^3.0.0",
     "fs-extra": "^11.2.0"
   }

diff --git a/packages/transformer-cjs-imports/package.json b/packages/transformer-cjs-imports/package.json
@@ -1,7 +1,7 @@
 {
   "name": "transformer-cjs-imports",
   "private": true,
-  "version": "4.79.4-alpha.4",
+  "version": "4.79.4-prerelease.0",
   "description": "Transform CJS imports to ESM in typescript depending on module target.",
   "main": "index.js",
   "author": "Red Hat",

diff --git a/packages/transformer-react-styles-esm-imports/package.json b/packages/transformer-react-styles-esm-imports/package.json
@@ -1,7 +1,7 @@
 {
   "name": "transformer-react-styles-esm-imports",
   "private": true,
-  "version": "1.0.1-alpha.5",
+  "version": "1.0.1-prerelease.0",
   "description": "Transform react-styles/css imports to target mjs files when compiling to ESM.",
   "main": "index.ts",
   "author": "Red Hat",