Skip to content

Commit 3da4f07

Browse files
wise-king-sullymanwise-king-sullyman
authored
Merge pull request #52 from patternfly/add-v6-configs
Update CI and semantic release for v6 branch
2 parents 2a5bd03 + 0a640e2 commit 3da4f07

File tree

5 files changed

+75
-74
lines changed

5 files changed

+75
-74
lines changed

‎.github/workflows/check-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
pull_request:
44
branches:
55
- main
6-
- v4
6+
- v6
77
jobs:
88
call-build-lint-test-workflow:
99
uses: ./.github/workflows/build-lint-test.yml

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches:
55
- main
6-
- v4
6+
- v6
77
jobs:
88
call-build-lint-test-workflow:
99
uses: ./.github/workflows/build-lint-test.yml

‎packages/module/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@patternfly/react-log-viewer",
3-
"version": "0.0.0",
3+
"version": "6.0.0-alpha.0",
44
"description": "Terminal renderer",
55
"main": "dist/js/index.js",
66
"module": "dist/esm/index.js",
77
"publishConfig": {
88
"access": "public",
9-
"tag": "prerelease"
9+
"tag": "alpha"
1010
},
1111
"scripts": {
1212
"build": "yarn build:esm && yarn build:cjs",
@@ -28,21 +28,21 @@
2828
},
2929
"homepage": "https://github.com/patternfly/react-log-viewer#readme",
3030
"dependencies": {
31-
"@patternfly/react-core": "^5.0.0",
32-
"@patternfly/react-icons": "^5.0.0",
33-
"@patternfly/react-styles": "^5.0.0",
31+
"@patternfly/react-core": "^6.0.0-alpha.1",
32+
"@patternfly/react-icons": "^6.0.0-alpha.1",
33+
"@patternfly/react-styles": "^6.0.0-alpha.1",
3434
"memoize-one": "^5.1.0"
3535
},
3636
"peerDependencies": {
3737
"react": "^17 || ^18",
3838
"react-dom": "^17 || ^18"
3939
},
4040
"devDependencies": {
41-
"@patternfly/documentation-framework": "^5.0.15",
42-
"@patternfly/patternfly": "^5.0.0",
43-
"@patternfly/react-table": "^5.0.0",
41+
"@patternfly/documentation-framework": "^5.2.20",
42+
"@patternfly/patternfly": "^6.0.0-alpha.9",
43+
"@patternfly/react-table": "^6.0.0-alpha.1",
4444
"@patternfly/patternfly-a11y": "^4.3.1",
45-
"@patternfly/react-code-editor": "^5.0.0",
45+
"@patternfly/react-code-editor": "^6.0.0-alpha.1",
4646
"resize-observer-polyfill": "^1.5.1",
4747
"tslib": "^2.0.0",
4848
"react-monaco-editor": "^0.51.0",

‎packages/module/release.config.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module.exports = {
22
branches: [
33
'do-not-delete',
4-
{ name: 'v4', channel: 'prerelease-v4', range: '4.x' },
5-
{ name: 'main', channel: 'prerelease', prerelease: 'prerelease' }
4+
{ name: 'main', channel: 'prerelease', prerelease: 'prerelease' },
5+
{ name: 'v6', channel: 'prerelease-v6', range: '6.x' },
66
],
77
analyzeCommits: {
88
preset: 'angular'
@@ -22,5 +22,6 @@ module.exports = {
2222
'@semantic-release/github',
2323
'@semantic-release/npm'
2424
],
25-
tagFormat: 'prerelease-v${version}'
25+
tagFormat: 'prerelease-v${version}',
26+
dryRun: true
2627
};

‎yarn.lock

+60-60
Original file line numberDiff line numberDiff line change
@@ -1602,21 +1602,21 @@
16021602
"@nodelib/fs.scandir" "2.1.5"
16031603
fastq "^1.6.0"
16041604

1605-
"@patternfly/ast-helpers@^0.4.57":
1606-
version "0.4.79"
1607-
resolved "https://registry.npmjs.org/@patternfly/ast-helpers/-/ast-helpers-0.4.79.tgz"
1608-
integrity sha512-Nn2Uut7Z1nQwDr5LAf1bns6yCFQFQWwXE2I1Ucvbk6s2Gl2X/85VGvww8FVO+YiW/plLZMLBFRPJMP4fs2N8Cg==
1605+
"@patternfly/ast-helpers@^1.2.25":
1606+
version "1.2.25"
1607+
resolved "https://registry.npmjs.org/@patternfly/ast-helpers/-/ast-helpers-1.2.25.tgz#15d38bccfc220f1279c33e05d66e866c5d7f958a"
1608+
integrity sha512-G9WEno3JPs89GOSEYb8+z+chxb42pbbMq3kPb+whu2yR7LfwyehFS2h4p+hYjceBVq/3hM1rhmLi6aN+v0z10A==
16091609
dependencies:
16101610
acorn "^8.4.1"
16111611
acorn-class-fields "^1.0.0"
16121612
acorn-jsx "^5.3.2"
16131613
acorn-static-class-features "^1.0.0"
16141614
astring "^1.7.5"
16151615

1616-
"@patternfly/documentation-framework@^5.0.15":
1617-
version "5.0.15"
1618-
resolved "https://registry.yarnpkg.com/@patternfly/documentation-framework/-/documentation-framework-5.0.15.tgz#56e6608de10a95a92787686e5db1eb3ff7c09b89"
1619-
integrity sha512-3r9fqPeAKY8GeJM6m7VPyPsiggxhyDbbWTo2/4T4NoNisVPpFXi0AzUaTpvJU2KcBx5pSot1mb84V3f8DHzWXg==
1616+
"@patternfly/documentation-framework@^5.2.20":
1617+
version "5.2.25"
1618+
resolved "https://registry.npmjs.org/@patternfly/documentation-framework/-/documentation-framework-5.2.25.tgz#d9d4c502f992bca19bed2465e935d2ba30b8dcab"
1619+
integrity sha512-CxLrTjNZ2KplakfWEIZP4FruHbFbsLAzLgFW13cD9eqIKdeuCvGSjhgzpr3/9SUMADH5w4gFMsAJZJH2+ptVhg==
16201620
dependencies:
16211621
"@babel/core" "7.18.2"
16221622
"@babel/plugin-proposal-class-properties" "7.17.12"
@@ -1626,7 +1626,7 @@
16261626
"@babel/plugin-transform-react-jsx" "7.17.12"
16271627
"@babel/preset-env" "7.18.2"
16281628
"@mdx-js/util" "1.6.16"
1629-
"@patternfly/ast-helpers" "^0.4.57"
1629+
"@patternfly/ast-helpers" "^1.2.25"
16301630
"@reach/router" "npm:@gatsbyjs/[email protected]"
16311631
autoprefixer "9.8.6"
16321632
babel-loader "9.1.2"
@@ -1702,60 +1702,60 @@
17021702
puppeteer-cluster "^0.23.0"
17031703
xmldoc "^1.1.2"
17041704

1705-
"@patternfly/patternfly@^5.0.0":
1706-
version "5.0.2"
1707-
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.2.tgz#f5daf2c98ccb85e6466d42fd61d39ba3c10ed532"
1708-
integrity sha512-PB8+MLdYVgF1hIOxGmnVsZG+YHUX3RePe5W1oMS4gS00EmSgw1cobr1Qbpy/BqqS8/R9DRN4hZ2FKDT0d5tkFQ==
1705+
"@patternfly/patternfly@^6.0.0-alpha.9":
1706+
version "6.0.0-alpha.10"
1707+
resolved "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-6.0.0-alpha.10.tgz#000908bbe91e5cbfb9eaa6443f736e04a81fa733"
1708+
integrity sha512-iZjLH4J0WYlgq9BUs7kQAJTQv0qfkr7+LRq39GEGOVvw7fmEZ6nhTaagXFgOSPziavNoGjg/iy4Nb6SPaPtPIA==
17091709

1710-
"@patternfly/react-code-editor@^5.0.0":
1711-
version "5.0.0"
1712-
resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-5.0.0.tgz#2ba9d49a84023907b94fcbec13ec62b2d463d33e"
1713-
integrity sha512-Ya1nuw2Zcor/MET+s0+VuYq2VsRb+VzKpZQ8Y1MbrXJdlWV6QS5Wf1M7jDl9lYkiJaS3pjG7eXNeVX2YJ+mQiw==
1710+
"@patternfly/react-code-editor@^6.0.0-alpha.1":
1711+
version "6.0.0-alpha.1"
1712+
resolved "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-6.0.0-alpha.1.tgz#523aebb729ac10bcd6daca291983e363ea428e36"
1713+
integrity sha512-LrAHUL3HExSGQ1/cr5phWOGNQypM05gXQWx2h/+skDe4yNh90+E1Gkuni6A1rhF7MZqugQV54lSszIYRz5gDGQ==
17141714
dependencies:
1715-
"@patternfly/react-core" "^5.0.0"
1716-
"@patternfly/react-icons" "^5.0.0"
1717-
"@patternfly/react-styles" "^5.0.0"
1715+
"@patternfly/react-core" "^6.0.0-alpha.1"
1716+
"@patternfly/react-icons" "^6.0.0-alpha.1"
1717+
"@patternfly/react-styles" "^6.0.0-alpha.1"
17181718
react-dropzone "14.2.3"
17191719
tslib "^2.5.0"
17201720

1721-
"@patternfly/react-core@^5.0.0":
1722-
version "5.0.0"
1723-
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-5.0.0.tgz#96c9e2315047eec94d28f5621c02fa147182dd6f"
1724-
integrity sha512-kewRVFhLw0Dvt8250pqrO47sVRx8E93sMGZbHQomJnZdachYeQ9STnQTP2gvOBq/GPnMei0LZLv0T99g8mPE4w==
1721+
"@patternfly/react-core@^6.0.0-alpha.1":
1722+
version "6.0.0-alpha.1"
1723+
resolved "https://registry.npmjs.org/@patternfly/react-core/-/react-core-6.0.0-alpha.1.tgz#f980c54db22cf42f6592754427a80ce6478a9b5a"
1724+
integrity sha512-ht8voYusmtMmAx96DY7NekhszWb8PqMl5Chw+sPBIItRqDbJDQRYXr2JamPhqyVfdmMJ61Jk6d85CumJ/C3wuw==
17251725
dependencies:
1726-
"@patternfly/react-icons" "^5.0.0"
1727-
"@patternfly/react-styles" "^5.0.0"
1728-
"@patternfly/react-tokens" "^5.0.0"
1729-
focus-trap "7.4.3"
1726+
"@patternfly/react-icons" "^6.0.0-alpha.1"
1727+
"@patternfly/react-styles" "^6.0.0-alpha.1"
1728+
"@patternfly/react-tokens" "^6.0.0-alpha.1"
1729+
focus-trap "7.5.2"
17301730
react-dropzone "^14.2.3"
17311731
tslib "^2.5.0"
17321732

1733-
"@patternfly/react-icons@^5.0.0":
1734-
version "5.0.0"
1735-
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-5.0.0.tgz#bb56ead97425f1b3ab886ee291ba6b6af4088e9d"
1736-
integrity sha512-GG5Y/UYl0h346MyDU9U650Csaq4Mxk8S6U8XC7ERk/xIrRr2RF67O2uY7zKBDMTNLYdBvPzgc2s3OMV1+d2/mg==
1737-
1738-
"@patternfly/react-styles@^5.0.0":
1739-
version "5.0.0"
1740-
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-5.0.0.tgz#63705ad498ff271fd056e92bd07b2c720ef3491a"
1741-
integrity sha512-xbSCgjx+fPrXbIzUznwTFWtJEbzVS0Wn4zrejdKJYQTY+4YcuPlFkeq2tl3syzwGsaYMpHiFwQiTaKyTvlwtuw==
1742-
1743-
"@patternfly/react-table@^5.0.0":
1744-
version "5.0.0"
1745-
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-5.0.0.tgz#2808f22d01818c31e6ddc69cc3a07c9381dc6d84"
1746-
integrity sha512-Q3MBo9+ZmBvLJzVHxmV9f/4qQAz5Si743zVLHRwjh+tjbn/DrcbxJdT8Uxa3NGKkpvszzgi/LPeXipJOHOELug==
1747-
dependencies:
1748-
"@patternfly/react-core" "^5.0.0"
1749-
"@patternfly/react-icons" "^5.0.0"
1750-
"@patternfly/react-styles" "^5.0.0"
1751-
"@patternfly/react-tokens" "^5.0.0"
1733+
"@patternfly/react-icons@^6.0.0-alpha.1":
1734+
version "6.0.0-alpha.1"
1735+
resolved "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-alpha.1.tgz#2ba63c24e6217a126b8dd9f7f3f8b23dc720c8e9"
1736+
integrity sha512-G7ewsy+eQSZGsi5i5Wg3zhwdnFS1S7so5qgaAslbId9yZwiJFnNL6s1c6bOkKwzRhIT6gNRL9YL77iswn7us6g==
1737+
1738+
"@patternfly/react-styles@^6.0.0-alpha.1":
1739+
version "6.0.0-alpha.1"
1740+
resolved "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-6.0.0-alpha.1.tgz#37b93c184d5d024b38b709afd107adb103568546"
1741+
integrity sha512-P5a/LYZkU+GkezhzXQaxRlCzgLCfvJNVAMOYq3m0FD51j4AxwlCkYeqnDxA+YFRMk+DSb8Pp1fXslmwRrFT83Q==
1742+
1743+
"@patternfly/react-table@^6.0.0-alpha.1":
1744+
version "6.0.0-alpha.1"
1745+
resolved "https://registry.npmjs.org/@patternfly/react-table/-/react-table-6.0.0-alpha.1.tgz#b8e407054c2ed3d628715ae368f896720f7d9254"
1746+
integrity sha512-0ThHk3wrLjDVSv4FZn4GhE+IDhnN92zhSZw/TM4Vsx67V3WrkBys5Iyg518BgohP19Z7D+Dp1V2F5ewJUEsRIQ==
1747+
dependencies:
1748+
"@patternfly/react-core" "^6.0.0-alpha.1"
1749+
"@patternfly/react-icons" "^6.0.0-alpha.1"
1750+
"@patternfly/react-styles" "^6.0.0-alpha.1"
1751+
"@patternfly/react-tokens" "^6.0.0-alpha.1"
17521752
lodash "^4.17.19"
17531753
tslib "^2.5.0"
17541754

1755-
"@patternfly/react-tokens@^5.0.0":
1756-
version "5.0.0"
1757-
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-5.0.0.tgz#8e2698d32d5353359e713312687a6b08ead0080b"
1758-
integrity sha512-to2CXIZ6WTuzBcjLZ+nXi5LhnYkSIDu3RBMRZwrplmECOoUWv87CC+2T0EVxtASRtpQfikjD2PDKMsif5i0BxQ==
1755+
"@patternfly/react-tokens@^6.0.0-alpha.1":
1756+
version "6.0.0-alpha.1"
1757+
resolved "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-6.0.0-alpha.1.tgz#20d67fd871dc3d4cbf26b9414c14d5eb15d5c6e7"
1758+
integrity sha512-b3P09skbUvKqgkmOvEwF31izWmkQ8+iUrJzQ6bt0L5D5OvUPMXcy+Ja3dOzaRG8+16S8lvN12h5Sh5RJLL6c1w==
17591759

17601760
"@polka/url@^1.0.0-next.20":
17611761
version "1.0.0-next.21"
@@ -5094,12 +5094,12 @@ flush-write-stream@^1.0.0:
50945094
inherits "^2.0.3"
50955095
readable-stream "^2.3.6"
50965096

5097-
focus-trap@7.4.3:
5098-
version "7.4.3"
5099-
resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.4.3.tgz#a3dae73d44df359eb92bbf37b18e173e813b16c5"
5100-
integrity sha512-BgSSbK4GPnS2VbtZ50VtOv1Sti6DIkj3+LkVjiWMNjLeAp1SH1UlLx3ULu/DCu4vq5R4/uvTm+zrvsMsuYmGLg==
5097+
focus-trap@7.5.2:
5098+
version "7.5.2"
5099+
resolved "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.2.tgz#e5ee678d10a18651f2591ffb66c949fb098d57cf"
5100+
integrity sha512-p6vGNNWLDGwJCiEjkSK6oERj/hEyI9ITsSwIUICBoKLlWiTWXJRfQibCwcoi50rTZdbi87qDtUlMCmQwsGSgPw==
51015101
dependencies:
5102-
tabbable "^6.1.2"
5102+
tabbable "^6.2.0"
51035103

51045104
[email protected]:
51055105
version "1.5.10"
@@ -9710,10 +9710,10 @@ symbol-tree@^3.2.4:
97109710
resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"
97119711
integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
97129712

9713-
tabbable@^6.1.2:
9714-
version "6.1.2"
9715-
resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.1.2.tgz#b0d3ca81d582d48a80f71b267d1434b1469a3703"
9716-
integrity sha512-qCN98uP7i9z0fIS4amQ5zbGBOq+OSigYeGvPy7NDk8Y9yncqDZ9pRPgfsc2PJIVM9RrJj7GIfuRgmjoUU9zTHQ==
9713+
tabbable@^6.2.0:
9714+
version "6.2.0"
9715+
resolved "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
9716+
integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
97179717

97189718
tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
97199719
version "2.2.1"

0 commit comments

Comments
 (0)