diff --git a/.github/workflows/build-lint-test.yml b/.github/workflows/build-lint-test.yml index 24bc00de..9e8fb3b8 100644 --- a/.github/workflows/build-lint-test.yml +++ b/.github/workflows/build-lint-test.yml @@ -14,7 +14,7 @@ jobs: git fetch origin pull/$GH_PR_NUM/head:tmp git checkout tmp fi - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: '20' - run: corepack enable @@ -36,7 +36,7 @@ jobs: git fetch origin pull/$GH_PR_NUM/head:tmp git checkout tmp fi - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: '20' - run: corepack enable @@ -59,7 +59,7 @@ jobs: git fetch origin pull/$GH_PR_NUM/head:tmp git checkout tmp fi - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: '20' - run: corepack enable @@ -84,7 +84,7 @@ jobs: git fetch origin pull/$GH_PR_NUM/head:tmp git checkout tmp fi - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: '20' - run: corepack enable diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c6b2b4b..1f7f2782 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - name: Run build script run: ./devSetup.sh shell: bash - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: '20' - run: corepack enable diff --git a/.github/workflows/pr-preview.yml b/.github/workflows/pr-preview.yml index 7ff0fd33..38b88d36 100644 --- a/.github/workflows/pr-preview.yml +++ b/.github/workflows/pr-preview.yml @@ -7,7 +7,7 @@ jobs: SURGE_LOGIN: ${{ secrets.SURGE_LOGIN }} SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }} GH_PR_TOKEN: ${{ secrets.GH_PR_TOKEN }} - GH_PR_NUM: ${{ github.event.number }} + GH_PR_NUM: ${{ github.event.number }} steps: - uses: actions/checkout@v2 # Yes, we really want to checkout the PR @@ -21,7 +21,7 @@ jobs: git log origin/main..HEAD --format="%b" # Yes, we really want to checkout the PR # Injected by generate-workflows.js - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: '20' - run: corepack enable @@ -38,4 +38,4 @@ jobs: name: Build docs - run: node .github/upload-preview.js packages/module/public name: Upload docs - if: always() \ No newline at end of file + if: always() diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e3d63e81..24d85fc8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: '20' - run: corepack enable diff --git a/package.json b/package.json index 890c00a1..535cb5f0 100644 --- a/package.json +++ b/package.json @@ -26,32 +26,33 @@ }, "devDependencies": { "@babel/core": "^7.19.6", + "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/plugin-proposal-decorators": "^7.21.0", "@babel/preset-env": "^7.19.4", - "@babel/preset-react": "^7.18.6", "@babel/preset-flow": "^7.18.6", + "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.21.0", - "@babel/plugin-proposal-class-properties": "^7.18.6", + "@octokit/rest": "^18.0.0", + "@testing-library/dom": "9.0.0", + "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "14.4.3", - "@testing-library/jest-dom": "5.16.5", - "@testing-library/dom": "9.0.0", + "@types/react": "^18", "@typescript-eslint/eslint-plugin": "^5.42.0", "@typescript-eslint/parser": "^5.42.0", - "@octokit/rest": "^18.0.0", "babel-jest": "^29.2.2", "concurrently": "^5.3.0", "eslint": "8.22.0", + "eslint-config-prettier": "8.5.0", + "eslint-config-standard-with-typescript": "^23.0.0", "eslint-plugin-import": "^2.25.2", "eslint-plugin-markdown": "^1.0.2", - "eslint-plugin-prettier": "^3.1.4", - "eslint-plugin-react": "^7.21.4", - "eslint-config-standard-with-typescript": "^23.0.0", "eslint-plugin-n": "^15.0.0", + "eslint-plugin-patternfly-react": "^4.80.4", + "eslint-plugin-prettier": "^3.1.4", "eslint-plugin-promise": "^6.0.0", + "eslint-plugin-react": "^7.21.4", "eslint-plugin-react-hooks": "^4.6.0", - "eslint-config-prettier": "8.5.0", - "eslint-plugin-patternfly-react": "^4.80.4", "jest": "^29.2.2", "jest-environment-jsdom": "^29.2.2", "jest-transform-stub": "^2.0.0", @@ -60,8 +61,7 @@ "react-dom": "^18", "serve": "^14.1.2", "surge": "^0.23.1", - "typedoc": "0.23", - "@types/react": "^18" + "typedoc": "0.23" }, "packageManager": "yarn@4.10.3" } diff --git a/packages/demo-app-ts/package.json b/packages/demo-app-ts/package.json index 347fb01b..fd58c0f4 100644 --- a/packages/demo-app-ts/package.json +++ b/packages/demo-app-ts/package.json @@ -1,46 +1,46 @@ { - "name": "demo-app-ts", - "private": true, - "version": "4.210.7", - "scripts": { - "build:demo-app": "webpack --mode production", - "start:demo-app": "webpack-dev-server", - "start:demo-app:hot": "webpack-dev-server --hot=true", - "serve:demo-app": "node scripts/serve" - }, - "dependencies": { - "@patternfly/react-core": "^6.0.0", - "@patternfly/react-icons": "^6.0.0", - "@patternfly/react-styles": "^6.0.0", - "react": "^18", - "react-dom": "^18", - "react-router": "^5.3.3", - "react-router-dom": "^5.3.3" - }, - "devDependencies": { - "@pmmmwh/react-refresh-webpack-plugin": "0.5.7", - "@types/react": "^18", - "@types/react-dom": "^18", - "@types/react-router": "^5.1.18", - "@types/react-router-dom": "^5.3.3", - "classnames": "^2.2.6", - "clean-webpack-plugin": "^3.0.0", - "copy-webpack-plugin": "^6.1.0", - "css-loader": "^4.3.0", - "file-loader": "^6.1.0", - "fork-ts-checker-webpack-plugin": "6.5.2", - "html-webpack-plugin": "^5.5.0", - "local-web-server": "^2.6.1", - "mini-css-extract-plugin": "^0.11.1", - "react-hot-loader": "4.13.0", - "react-refresh": "0.14.0", - "react-refresh-typescript": "2.0.7", - "style-loader": "3.3.1", - "ts-loader": "^8.3.0", - "typescript": "^4.7.4", - "url-loader": "^4.1.0", - "webpack": "5.73.0", - "webpack-cli": "4.10.0", - "webpack-dev-server": "4.9.3" - } -} \ No newline at end of file + "name": "demo-app-ts", + "private": true, + "version": "4.210.7", + "scripts": { + "build:demo-app": "webpack --mode production", + "start:demo-app": "webpack-dev-server", + "start:demo-app:hot": "webpack-dev-server --hot=true", + "serve:demo-app": "node scripts/serve" + }, + "dependencies": { + "@patternfly/react-core": "^6.4.0", + "@patternfly/react-icons": "^6.4.0", + "@patternfly/react-styles": "^6.4.0", + "react": "^18", + "react-dom": "^18", + "react-router": "^5.3.3", + "react-router-dom": "^5.3.3" + }, + "devDependencies": { + "@pmmmwh/react-refresh-webpack-plugin": "0.5.7", + "@types/react": "^18", + "@types/react-dom": "^18", + "@types/react-router": "^5.1.18", + "@types/react-router-dom": "^5.3.3", + "classnames": "^2.2.6", + "clean-webpack-plugin": "^3.0.0", + "copy-webpack-plugin": "^6.1.0", + "css-loader": "^4.3.0", + "file-loader": "^6.1.0", + "fork-ts-checker-webpack-plugin": "6.5.2", + "html-webpack-plugin": "^5.5.0", + "local-web-server": "^2.6.1", + "mini-css-extract-plugin": "^0.11.1", + "react-hot-loader": "4.13.0", + "react-refresh": "0.14.0", + "react-refresh-typescript": "2.0.7", + "style-loader": "3.3.1", + "ts-loader": "^8.3.0", + "typescript": "^4.7.4", + "url-loader": "^4.1.0", + "webpack": "5.73.0", + "webpack-cli": "4.10.0", + "webpack-dev-server": "4.9.3" + } +} diff --git a/packages/module/package.json b/packages/module/package.json index 02399211..a40b99f9 100644 --- a/packages/module/package.json +++ b/packages/module/package.json @@ -33,13 +33,13 @@ "tag": "prerelease" }, "dependencies": { - "@patternfly/react-core": "^6.0.0", - "@patternfly/react-icons": "^6.0.0", - "@patternfly/react-styles": "^6.0.0", + "@dagrejs/dagre": "1.1.2", + "@patternfly/react-core": "^6.4.0", + "@patternfly/react-icons": "^6.4.0", + "@patternfly/react-styles": "^6.4.0", "@types/d3": "^7.4.0", "@types/d3-force": "^1.2.1", "d3": "^7.8.0", - "@dagrejs/dagre": "1.1.2", "mobx": "^6.9.0", "mobx-react": "^7.6.0", "point-in-svg-path": "^1.0.1", @@ -52,11 +52,11 @@ "react-dom": "^17 || ^18 || ^19" }, "devDependencies": { - "@patternfly/documentation-framework": "6.0.0-alpha.120", - "@patternfly/patternfly": "^6.0.0", + "@patternfly/documentation-framework": "^6.24.2", + "@patternfly/patternfly": "^6.4.0", "@patternfly/patternfly-a11y": "^4.3.1", - "@patternfly/react-code-editor": "^6.0.0", - "@patternfly/react-table": "^6.0.0", + "@patternfly/react-code-editor": "^6.4.0", + "@patternfly/react-table": "^6.4.0", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", "camel-case": "^3.0.0", @@ -64,11 +64,11 @@ "fs-extra": "^6.0.1", "glob": "^7.1.2", "jsdom": "^15.1.0", + "monaco-editor": "^0.34.1", "react": "^18.0.0", "react-dom": "^18.0.0", - "rimraf": "^2.6.2", - "typescript": "^4.7.4", "react-monaco-editor": "^0.51.0", - "monaco-editor": "^0.34.1" + "rimraf": "^2.6.2", + "typescript": "^4.7.4" } } diff --git a/packages/module/patternfly-docs/patternfly-docs.config.js b/packages/module/patternfly-docs/patternfly-docs.config.js index 6a5b590c..6ab1283c 100644 --- a/packages/module/patternfly-docs/patternfly-docs.config.js +++ b/packages/module/patternfly-docs/patternfly-docs.config.js @@ -2,5 +2,7 @@ module.exports = { sideNavItems: [{ section: 'topology' }], topNavItems: [], - port: 8008 + port: 8008, + hasThemeSwitcher: true, + hasHighContrastSwitcher: true }; diff --git a/packages/module/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap b/packages/module/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap index dd8738a5..3998afe5 100644 --- a/packages/module/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap +++ b/packages/module/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap @@ -97,7 +97,7 @@ exports[`TopologyControlBar should accept button options correctly 1`] = ` style="display: contents;" >