diff --git a/packages/dev/package.json b/packages/dev/package.json index d0fc519e..b40b245f 100644 --- a/packages/dev/package.json +++ b/packages/dev/package.json @@ -9,9 +9,9 @@ "serve": "serve public" }, "dependencies": { - "@patternfly/patternfly": "6.0.0-prerelease.13", - "@patternfly/quickstarts": "^6.0.0-prerelease.0", - "@patternfly/react-core": "6.0.0-prerelease.14", + "@patternfly/patternfly": "6.0.0-prerelease.15", + "@patternfly/quickstarts": "^6.0.0-alpha.0", + "@patternfly/react-core": "6.0.0-prerelease.21", "i18next": "^19.8.3", "i18next-browser-languagedetector": "^8.0.0", "i18next-parser": "^9.0.0", diff --git a/packages/dev/src/CustomCatalog.tsx b/packages/dev/src/CustomCatalog.tsx index 3d6597ee..a99ae76b 100644 --- a/packages/dev/src/CustomCatalog.tsx +++ b/packages/dev/src/CustomCatalog.tsx @@ -133,7 +133,7 @@ export const CustomCatalog: React.FC = () => { Instructional examples - + {allQuickStarts .filter((quickStart: QuickStart) => quickStart.metadata.instructional) .map((quickStart: QuickStart, index: number) => { @@ -172,7 +172,7 @@ export const CustomCatalog: React.FC = () => { Additional examples - + {allQuickStarts .filter((quickStart: QuickStart) => !quickStart.metadata.instructional) .map((quickStart: QuickStart, index: number) => { diff --git a/packages/module/package.json b/packages/module/package.json index 7c3050b0..a63861c5 100644 --- a/packages/module/package.json +++ b/packages/module/package.json @@ -45,7 +45,7 @@ "docs:copy": "mkdir -p dist/patternfly-docs && cp -R patternfly-docs/content/extensions/quick-starts dist/patternfly-docs" }, "peerDependencies": { - "@patternfly/react-core": "6.0.0-alpha.100", + "@patternfly/react-core": "6.0.0-prerelease.21", "react": ">=18.0.0", "react-dom": ">=18.0.0", "showdown": ">=2.1.0" @@ -55,14 +55,14 @@ "history": "^5.0.0" }, "devDependencies": { - "@patternfly/documentation-framework": "6.0.0-alpha.100", - "@patternfly/patternfly": "6.0.0-prerelease.13", - "@patternfly/react-icons": "6.0.0-prerelease.4", - "@patternfly/react-styles": "6.0.0-prerelease.3", - "@patternfly/react-tokens": "6.0.0-prerelease.4", - "@patternfly/react-table": "6.0.0-prerelease.15", - "@patternfly/react-code-editor": "6.0.0-prerelease.14", - "@patternfly/react-core": "6.0.0-prerelease.14", + "@patternfly/documentation-framework": "6.0.0-alpha.108", + "@patternfly/patternfly": "6.0.0-prerelease.15", + "@patternfly/react-icons": "6.0.0-prerelease.7", + "@patternfly/react-styles": "6.0.0-prerelease.6", + "@patternfly/react-tokens": "6.0.0-prerelease.7", + "@patternfly/react-table": "6.0.0-prerelease.22", + "@patternfly/react-code-editor": "6.0.0-prerelease.21", + "@patternfly/react-core": "6.0.0-prerelease.21", "@rollup/plugin-commonjs": "^17.0.0", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^11.1.0", diff --git a/packages/module/src/catalog/QuickStartCatalog.tsx b/packages/module/src/catalog/QuickStartCatalog.tsx index f1bd946a..4d96af20 100644 --- a/packages/module/src/catalog/QuickStartCatalog.tsx +++ b/packages/module/src/catalog/QuickStartCatalog.tsx @@ -15,7 +15,7 @@ const QuickStartCatalog: React.FC = ({ quickStarts }) => return (
- + {quickStarts.map((quickStart, index) => { const { metadata: { name: id }, diff --git a/packages/module/src/catalog/QuickStartTileHeader.tsx b/packages/module/src/catalog/QuickStartTileHeader.tsx index 9cb438a8..704a16ef 100644 --- a/packages/module/src/catalog/QuickStartTileHeader.tsx +++ b/packages/module/src/catalog/QuickStartTileHeader.tsx @@ -1,6 +1,5 @@ import * as React from 'react'; import { Button, Flex, Title } from '@patternfly/react-core'; -import QuickStartMarkdownView from '../QuickStartMarkdownView'; interface QuickStartTileHeaderProps { name: string; @@ -16,7 +15,7 @@ const QuickStartTileHeader: React.FC = ({ <Button variant="link" isInline onClick={onSelect}> - <QuickStartMarkdownView content={name} /> + {name} </Button> diff --git a/packages/module/src/controller/QuickStartTaskHeaderList.tsx b/packages/module/src/controller/QuickStartTaskHeaderList.tsx index 277dac74..58728bb8 100644 --- a/packages/module/src/controller/QuickStartTaskHeaderList.tsx +++ b/packages/module/src/controller/QuickStartTaskHeaderList.tsx @@ -14,7 +14,7 @@ const QuickStartTaskHeaderList: React.FC = ({ onTaskSelect, }) => tasks?.length > 0 ? ( -
    +
      {tasks.map((task, index) => ( = ({ const { getResource, alwaysShowTaskReview } = React.useContext(QuickStartContext); return ( -
      +
        {tasks .filter((_, index) => allTaskStatuses[index] !== QuickStartTaskStatus.INIT) diff --git a/packages/vscode/package.json b/packages/vscode/package.json index 98d0cb42..d33011b6 100644 --- a/packages/vscode/package.json +++ b/packages/vscode/package.json @@ -61,7 +61,7 @@ }, "dependencies": { "@cloudmosaic/quickstarts": "^0.0.6", - "@patternfly/patternfly": "^6.0.0-prerelease.0", + "@patternfly/patternfly": "6.0.0-prerelease.15", "i18next-parser": "^9.0.0", "js-base64": "^3.6.0", "js-yaml": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index bac97181..13aa5710 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1375,10 +1375,10 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@patternfly/ast-helpers@^1.4.0-alpha.89": - version "1.4.0-alpha.91" - resolved "https://registry.yarnpkg.com/@patternfly/ast-helpers/-/ast-helpers-1.4.0-alpha.91.tgz#eafd39ae122fa24112562816bc9f7189019bbddc" - integrity sha512-r8h/sr/oSmf4ODNtUzuA9d/9m539rqXpbUzcyQJYOv2LFujJnLDmvY4RcVmImshgvpLPrJBSi0/8TVjFpDkidg== +"@patternfly/ast-helpers@^1.4.0-alpha.97": + version "1.4.0-alpha.98" + resolved "https://registry.yarnpkg.com/@patternfly/ast-helpers/-/ast-helpers-1.4.0-alpha.98.tgz#e66d10d3aaafb8a7e26db4dd1cb13deca16c6202" + integrity sha512-7Xho5JhBMVB9O9uQg2zChxpaD95EdTdcYQd4JD/YYhFfE1AWMBUipNuW2PhoohGBOVt2HhKq9ltUEPWIxqgHTA== dependencies: acorn "^8.4.1" acorn-class-fields "^1.0.0" @@ -1386,16 +1386,16 @@ acorn-static-class-features "^1.0.0" astring "^1.7.5" -"@patternfly/documentation-framework@6.0.0-alpha.100": - version "6.0.0-alpha.100" - resolved "https://registry.yarnpkg.com/@patternfly/documentation-framework/-/documentation-framework-6.0.0-alpha.100.tgz#7fabacf077e270c135ddfccefefb7c2284e7bf16" - integrity sha512-5AQw2prM2Jo3M+CzOAgQHCHZ9C3/aonTxCWd7hM5DqqaKuoNyFe8LcDA4PF9EfYhwKnPCM6qbdc07jYelM2Awg== +"@patternfly/documentation-framework@6.0.0-alpha.108": + version "6.0.0-alpha.108" + resolved "https://registry.yarnpkg.com/@patternfly/documentation-framework/-/documentation-framework-6.0.0-alpha.108.tgz#209475c2d01ad874b6fc1dee5a79c7483084399b" + integrity sha512-UVsjubhDXxDKs2fUJPD79wdngxDRXswsGnDEVc8jUMzVvV4cpyDbLfCRQdqMfyn1SJH6a5fBSkU72uUdXElA9A== dependencies: "@babel/core" "^7.24.3" "@babel/preset-env" "^7.24.3" "@babel/preset-react" "^7.24.1" "@mdx-js/util" "1.6.16" - "@patternfly/ast-helpers" "^1.4.0-alpha.89" + "@patternfly/ast-helpers" "^1.4.0-alpha.97" "@reach/router" "npm:@gatsbyjs/reach-router@1.3.9" autoprefixer "9.8.6" babel-loader "^9.1.3" @@ -1407,7 +1407,7 @@ copy-webpack-plugin "11.0.0" css-loader "6.7.3" detab "2.0.3" - express "4.20.0" + express "4.21.0" file-loader "6.2.0" file-saver "1.3.8" fs-extra "9.0.1" @@ -1468,73 +1468,61 @@ puppeteer-cluster "^0.23.0" xmldoc "^1.1.2" -"@patternfly/patternfly@6.0.0-prerelease.13": - version "6.0.0-prerelease.13" - resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.0.0-prerelease.13.tgz#d7ab63727e8729b4681a56b6dcf1e8bad46e5bec" - integrity sha512-Rs5WuiIzt87pp2saJ2AtN1pU9qj7/VjU4vsKEprIf0S1hBANrGVuMWrDBxfsBQptWqc9TLpxJJcuPEUjz2w5aw== +"@patternfly/patternfly@6.0.0-prerelease.15": + version "6.0.0-prerelease.15" + resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.0.0-prerelease.15.tgz#fb44ccf5c0675d3adff0a281938be4ead707a6bd" + integrity sha512-7/tRjaWBMX9bvMhIexdAONgxKiVbOCuFffLEKq+p+Q4t8Qq8fqGM7eAznzOx3YbLKIzqVtmbRrgTAIkpsSe1aw== -"@patternfly/react-code-editor@6.0.0-prerelease.14": - version "6.0.0-prerelease.14" - resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-6.0.0-prerelease.14.tgz#9d80cc42c24ca9d9a8f4b63be2c25113b66673c0" - integrity sha512-IlGrz0kldW2AWY+cK7N4SDJiou66FaMouOU6Aj1rpzKr4xguKAFkpzVLPfi63mXtLhGKoyypCBjUHMxC+Dog4g== +"@patternfly/react-code-editor@6.0.0-prerelease.21": + version "6.0.0-prerelease.21" + resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-6.0.0-prerelease.21.tgz#3241299b40ca009e6cab98a28a7b2ed6d2259f98" + integrity sha512-t9/8Uk3sbPaXasZXHaIxvcAGRWAlep9L0Gsy1vA+vzmpU8Igk1GO2JNMVr9ux4ScLEuMnzp0Rbq++VbxtDNdwA== dependencies: "@monaco-editor/react" "^4.6.0" - "@patternfly/react-core" "^6.0.0-prerelease.14" - "@patternfly/react-icons" "^6.0.0-prerelease.4" - "@patternfly/react-styles" "^6.0.0-prerelease.3" + "@patternfly/react-core" "^6.0.0-prerelease.21" + "@patternfly/react-icons" "^6.0.0-prerelease.7" + "@patternfly/react-styles" "^6.0.0-prerelease.6" react-dropzone "14.2.3" tslib "^2.7.0" -"@patternfly/react-core@6.0.0-prerelease.14": - version "6.0.0-prerelease.14" - resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-6.0.0-prerelease.14.tgz#e53677e217279ff749fe8b5bfe49337d97c7882f" - integrity sha512-FkKx9p76tLXc8kVOeYs16hNOjuwn7AxCI6OPB9lEEZOcIGTPixmvNLLy/AKeCyi1rQeZvh74XZJZTIDJLhVB1w== - dependencies: - "@patternfly/react-icons" "^6.0.0-prerelease.4" - "@patternfly/react-styles" "^6.0.0-prerelease.3" - "@patternfly/react-tokens" "^6.0.0-prerelease.4" - focus-trap "7.6.0" - react-dropzone "^14.2.3" - tslib "^2.7.0" - -"@patternfly/react-core@^6.0.0-prerelease.14": - version "6.0.0-prerelease.15" - resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-6.0.0-prerelease.15.tgz#c4f4e342779dd7c33b9e72bf0e8877030c57e4ab" - integrity sha512-stRGgtmbS0LH69GdelB21UQPtSJ+HqIYlgJHLKqsqu4NF5C8Q4xJHFJK5vQCO+6AajQEn8bkfTAqO/Ke4LU5wg== +"@patternfly/react-core@6.0.0-prerelease.21", "@patternfly/react-core@^6.0.0-prerelease.21": + version "6.0.0-prerelease.21" + resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-6.0.0-prerelease.21.tgz#78dc72a3bcf4f0bf886a5dc6edd765b6bfc0db74" + integrity sha512-EaGcKUPeeR253vY4N0Ahm9oOVtltoI6JycfclwmzjevOzpYvuLj1jcsVwL8wqgWYQVpURoBm1yxIdx34fo5UHA== dependencies: - "@patternfly/react-icons" "^6.0.0-prerelease.4" - "@patternfly/react-styles" "^6.0.0-prerelease.3" - "@patternfly/react-tokens" "^6.0.0-prerelease.4" + "@patternfly/react-icons" "^6.0.0-prerelease.7" + "@patternfly/react-styles" "^6.0.0-prerelease.6" + "@patternfly/react-tokens" "^6.0.0-prerelease.7" focus-trap "7.6.0" react-dropzone "^14.2.3" tslib "^2.7.0" -"@patternfly/react-icons@6.0.0-prerelease.4", "@patternfly/react-icons@^6.0.0-prerelease.4": - version "6.0.0-prerelease.4" - resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-6.0.0-prerelease.4.tgz#21ddc2a6c66adb6d4160e043a167d750841a8af0" - integrity sha512-KHo0v4XG4vS5wSZ76EUOrXDM636/ikXe6lNYqbAL/KRfqhfvXHEESZnK+0p1tpoBwwEUivAmJNSdIjppBPhACg== - -"@patternfly/react-styles@6.0.0-prerelease.3", "@patternfly/react-styles@^6.0.0-prerelease.3": - version "6.0.0-prerelease.3" - resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-6.0.0-prerelease.3.tgz#16142ad8f3dbec9cc69c2b54690dba02f86e67fa" - integrity sha512-VyAODCKA/PkyGMVT0A2G2TVVx1H1QKBrmXBwY11Ba3ggvuLZ2zWu+vU9LyM/HhmefOwy+5/P8bmRtLM+37D/CA== - -"@patternfly/react-table@6.0.0-prerelease.15": - version "6.0.0-prerelease.15" - resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-6.0.0-prerelease.15.tgz#02fe4261d5c01363739d42b6f2d1caa659b479fd" - integrity sha512-yGIZ8N2mtZcZFSiZDe8B9Zbk+XfLJLwe/fIqZz47a6qb9d3gva+L9l2yb2Qk71yDT/p+euQ1uRO8f/YlQWTYGA== - dependencies: - "@patternfly/react-core" "^6.0.0-prerelease.14" - "@patternfly/react-icons" "^6.0.0-prerelease.4" - "@patternfly/react-styles" "^6.0.0-prerelease.3" - "@patternfly/react-tokens" "^6.0.0-prerelease.4" +"@patternfly/react-icons@6.0.0-prerelease.7", "@patternfly/react-icons@^6.0.0-prerelease.7": + version "6.0.0-prerelease.7" + resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-6.0.0-prerelease.7.tgz#44218ac52e5a8440bd0bb96eceef3df4c9239b86" + integrity sha512-DQmecVgXRIiD3ww4KUuJ0qO76TmYMDEJ1ao1+DYuTSP+FzeJLJKuE9QxvL8qn3anyKtuORBuHdTIjM52mVq5Vg== + +"@patternfly/react-styles@6.0.0-prerelease.6", "@patternfly/react-styles@^6.0.0-prerelease.6": + version "6.0.0-prerelease.6" + resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-6.0.0-prerelease.6.tgz#e46acc02c8bc2464846544ebf55bbc4a646824b9" + integrity sha512-tI28gIJFgbgVQs7Xj705csfl6T92dr5Bh7ynR5gN4+QdTWCUWmSctp46G2ZewXdrIN+C+2zUPE86o77aFp4CWw== + +"@patternfly/react-table@6.0.0-prerelease.22": + version "6.0.0-prerelease.22" + resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-6.0.0-prerelease.22.tgz#4f4207218d30ec422cd04787d2eaeeef8d34b868" + integrity sha512-vGDWr14YATIY9RnxaOpyjkPlw4aKBM7dhHJRPXY0cwCFehSGwwzQpialZyi+92I2WfBF1Cb75doDAtxTSi8UZQ== + dependencies: + "@patternfly/react-core" "^6.0.0-prerelease.21" + "@patternfly/react-icons" "^6.0.0-prerelease.7" + "@patternfly/react-styles" "^6.0.0-prerelease.6" + "@patternfly/react-tokens" "^6.0.0-prerelease.7" lodash "^4.17.21" tslib "^2.7.0" -"@patternfly/react-tokens@6.0.0-prerelease.4", "@patternfly/react-tokens@^6.0.0-prerelease.4": - version "6.0.0-prerelease.4" - resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-6.0.0-prerelease.4.tgz#0b0e0eaa271847cf71f6828b0ad048b5efa783d9" - integrity sha512-T1/C6nj78zvk4zLUp3VvNI3hChPR2vEy0BasIG3AYakWoLJsdOY6qS3PlLulawNZvlK7KH0X7VRfT1Zk073R6A== +"@patternfly/react-tokens@6.0.0-prerelease.7", "@patternfly/react-tokens@^6.0.0-prerelease.7": + version "6.0.0-prerelease.7" + resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-6.0.0-prerelease.7.tgz#68525ffcf08aebe2436d77af168a5fb4b3478b17" + integrity sha512-SLgVwbIgVx26LCjaXkpNlPIZYqWpHJkw3QX/n3URLmIcRlCw536/rKO1PzXaeuCCqhuSq66J6R125zM2eJjM6A== "@pkgr/utils@^2.3.1": version "2.4.0" @@ -6293,10 +6281,10 @@ expect@^21.2.1: jest-message-util "^21.2.1" jest-regex-util "^21.2.0" -express@4.20.0: - version "4.20.0" - resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48" - integrity sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw== +express@4.21.0: + version "4.21.0" + resolved "https://registry.yarnpkg.com/express/-/express-4.21.0.tgz#d57cb706d49623d4ac27833f1cbc466b668eb915" + integrity sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng== dependencies: accepts "~1.3.8" array-flatten "1.1.1" @@ -6310,7 +6298,7 @@ express@4.20.0: encodeurl "~2.0.0" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "1.2.0" + finalhandler "1.3.1" fresh "0.5.2" http-errors "2.0.0" merge-descriptors "1.0.3" @@ -6319,11 +6307,11 @@ express@4.20.0: parseurl "~1.3.3" path-to-regexp "0.1.10" proxy-addr "~2.0.7" - qs "6.11.0" + qs "6.13.0" range-parser "~1.2.1" safe-buffer "5.2.1" send "0.19.0" - serve-static "1.16.0" + serve-static "1.16.2" setprototypeof "1.2.0" statuses "2.0.1" type-is "~1.6.18" @@ -6636,6 +6624,19 @@ finalhandler@1.2.0: statuses "2.0.1" unpipe "~1.0.0" +finalhandler@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019" + integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ== + dependencies: + debug "2.6.9" + encodeurl "~2.0.0" + escape-html "~1.0.3" + on-finished "2.4.1" + parseurl "~1.3.3" + statuses "2.0.1" + unpipe "~1.0.0" + find-cache-dir@^3.3.1, find-cache-dir@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" @@ -12265,9 +12266,9 @@ readdirp@^2.0.0: readable-stream "^2.0.2" readdirp@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.1.tgz#b2fe35f8dca63183cd3b86883ecc8f720ea96ae6" - integrity sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a" + integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA== readdirp@~3.6.0: version "3.6.0" @@ -13123,15 +13124,15 @@ serve-static@1.15.0: parseurl "~1.3.3" send "0.18.0" -serve-static@1.16.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.0.tgz#2bf4ed49f8af311b519c46f272bf6ac3baf38a92" - integrity sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA== +serve-static@1.16.2: + version "1.16.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296" + integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw== dependencies: - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.18.0" + send "0.19.0" serve@^11.3.2: version "11.3.2"