diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml index fa99007..e193a8c 100644 --- a/.github/workflows/check-pr.yml +++ b/.github/workflows/check-pr.yml @@ -3,6 +3,7 @@ on: pull_request: branches: - main + - v4 jobs: call-build-lint-test-workflow: uses: ./.github/workflows/build-lint-test.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2648b8a..142b211 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,7 @@ on: push: branches: - main + - v4 jobs: call-build-lint-test-workflow: uses: ./.github/workflows/build-lint-test.yml diff --git a/jest.config.js b/jest.config.js index 7cb89f0..7bcebfa 100644 --- a/jest.config.js +++ b/jest.config.js @@ -10,10 +10,11 @@ module.exports = { transform: { '^.+\\.[jt]sx?$': 'babel-jest' }, - transformIgnorePatterns: ['node_modules/(?!@novnc)'], + transformIgnorePatterns: ['node_modules/(?!@novnc|@patternfly)'], setupFilesAfterEnv: ['/testSetup.ts'], moduleNameMapper: { '\\.(css|less)$': '/styleMock.js' }, - testEnvironment: 'jsdom' + testEnvironment: 'jsdom', + dryRun: true }; diff --git a/packages/module/package.json b/packages/module/package.json index 89a607d..16e59a2 100644 --- a/packages/module/package.json +++ b/packages/module/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-console", - "version": "4.93.38", + "version": "5.0.0-alpha.0", "description": "This package provides VncConsole, SerialConsole and DesktopViewer React components to be used alongside patternfly-react to access virtual machine or server consoles.", "main": "dist/esm/index.js", "module": "dist/esm/index.js", @@ -29,12 +29,13 @@ }, "homepage": "https://github.com/patternfly/react-console/#readme", "publishConfig": { - "access": "public" + "access": "public", + "tag": "alpha" }, "dependencies": { "@novnc/novnc": "^1.3.0", - "@patternfly/react-core": "^4.276.6", - "@patternfly/react-styles": "^4.92.6", + "@patternfly/react-core": "^5.0.0-alpha.50", + "@patternfly/react-styles": "^5.0.0-alpha.5", "@spice-project/spice-html5": "^0.2.1", "file-saver": "^1.3.8", "xterm": "^4.8.1", @@ -45,10 +46,10 @@ "react-dom": "^16.8 || ^17 || ^18" }, "devDependencies": { - "@patternfly/documentation-framework": "^1.8.1", - "@patternfly/patternfly": "^4.224.2", - "@patternfly/react-table": "^4.112.39", - "@patternfly/react-code-editor": "^4.82.113", + "@patternfly/documentation-framework": "^2.0.0-alpha.12", + "@patternfly/patternfly": "^5.0.0-alpha.37", + "@patternfly/react-table": "^5.0.0-alpha.51", + "@patternfly/react-code-editor": "^5.0.0-alpha.51", "rimraf": "^2.6.2", "@patternfly/patternfly-a11y": "^4.3.1", "serve": "^14.1.2" diff --git a/packages/module/patternfly-docs/generated/extensions/react-console/react.js b/packages/module/patternfly-docs/generated/extensions/react-console/react.js index 537ff65..7e95e89 100644 --- a/packages/module/patternfly-docs/generated/extensions/react-console/react.js +++ b/packages/module/patternfly-docs/generated/extensions/react-console/react.js @@ -14,7 +14,6 @@ const pageData = { "section": "extensions", "subsection": "", "source": "react", - "tabName": null, "slug": "/extensions/react-console/react", "sourceLink": "https://github.com/patternfly/react-console", "relPath": "packages/module/patternfly-docs/content/extensions/react-console/examples/ReactConsole.md", diff --git a/packages/module/patternfly-docs/generated/index.js b/packages/module/patternfly-docs/generated/index.js index a716dbf..2a1b166 100644 --- a/packages/module/patternfly-docs/generated/index.js +++ b/packages/module/patternfly-docs/generated/index.js @@ -7,7 +7,6 @@ module.exports = { section: "extensions", subsection: "", source: "react", - tabName: null, Component: () => import(/* webpackChunkName: "extensions/react-console/react/index" */ './extensions/react-console/react') } }; \ No newline at end of file diff --git a/packages/module/release.config.js b/packages/module/release.config.js index e7b8898..d02133f 100644 --- a/packages/module/release.config.js +++ b/packages/module/release.config.js @@ -1,6 +1,9 @@ module.exports = { - branches: [{ name: 'main', channel: 'prerelease' }], + branches: [ + { name: 'v4', channel: 'prerelease' }, + { name: 'main', channel: 'alpha', prerelease: 'alpha' } + ], analyzeCommits: { preset: 'angular' }, @@ -10,5 +13,6 @@ module.exports = { '@semantic-release/github', '@semantic-release/npm' ], - tagFormat: 'v${version}' + tagFormat: 'v${version}', + dryRun: true }; \ No newline at end of file diff --git a/packages/module/src/components/AccessConsoles/AccessConsoles.tsx b/packages/module/src/components/AccessConsoles/AccessConsoles.tsx index 6637c31..36e6a54 100644 --- a/packages/module/src/components/AccessConsoles/AccessConsoles.tsx +++ b/packages/module/src/components/AccessConsoles/AccessConsoles.tsx @@ -69,7 +69,7 @@ export const AccessConsoles: React.FunctionComponent = ({ } }); - const onToggle = (isOpen: boolean) => { + const onToggle = (_event: any, isOpen: boolean) => { setIsOpen(isOpen); }; diff --git a/packages/module/src/components/AccessConsoles/__snapshots__/AccessConsoles.test.tsx.snap b/packages/module/src/components/AccessConsoles/__snapshots__/AccessConsoles.test.tsx.snap index 15c7a43..d58cc89 100644 --- a/packages/module/src/components/AccessConsoles/__snapshots__/AccessConsoles.test.tsx.snap +++ b/packages/module/src/components/AccessConsoles/__snapshots__/AccessConsoles.test.tsx.snap @@ -129,22 +129,22 @@ exports[`AccessConsoles with preselected SerialConsole 1`] = `
-
= ({ default: terminal = ( - + {textLoading} ); diff --git a/packages/module/src/components/SerialConsole/__snapshots__/SerialConsole.test.tsx.snap b/packages/module/src/components/SerialConsole/__snapshots__/SerialConsole.test.tsx.snap index 0059d0e..28909b3 100644 --- a/packages/module/src/components/SerialConsole/__snapshots__/SerialConsole.test.tsx.snap +++ b/packages/module/src/components/SerialConsole/__snapshots__/SerialConsole.test.tsx.snap @@ -70,22 +70,22 @@ exports[`SerialConsole in the LOADING state 1`] = `
-
{ /** Callback for when Ctrl+Alt+Delete item is selected */ @@ -17,7 +21,7 @@ export const SpiceActions: React.FunctionComponent = ({ const [isOpen, setIsOpen] = React.useState(false); return ( - { setIsOpen(!isOpen); @@ -25,9 +29,9 @@ export const SpiceActions: React.FunctionComponent = ({ }} isOpen={isOpen} toggle={ - setIsOpen(isDropdownOpen)}>{textSendShortcut} + setIsOpen(isDropdownOpen)}>{textSendShortcut} } - dropdownItems={[{textCtrlAltDel}]} + dropdownItems={[{textCtrlAltDel}]} /> ); }; diff --git a/packages/module/src/components/VncConsole/VncActions.tsx b/packages/module/src/components/VncConsole/VncActions.tsx index 30c1d1d..42b5c20 100644 --- a/packages/module/src/components/VncConsole/VncActions.tsx +++ b/packages/module/src/components/VncConsole/VncActions.tsx @@ -1,6 +1,14 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; -import { Dropdown, DropdownItem, DropdownToggle, Button, ButtonVariant } from '@patternfly/react-core'; +import { + Button, + ButtonVariant +} from '@patternfly/react-core'; +import { + Dropdown as DropdownDeprecated, + DropdownItem as DropdownItemDeprecated, + DropdownToggle as DropdownToggleDeprecated +} from '@patternfly/react-core/deprecated'; import styles from '@patternfly/react-styles/css/components/Consoles/VncConsole'; @@ -27,19 +35,19 @@ export const VncActions: React.FunctionComponent = ({ const toolbar = (
{additionalButtons} - setIsOpen(false)} toggle={ - setIsOpen(!isOpen)}> + setIsOpen(!isOpen)}> {textSendShortcut} - + } isOpen={isOpen} dropdownItems={[ - + {textCtrlAltDel} - + ]} />