Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(build): update versions to fix build, style fixes #1

Open
wants to merge 6 commits into
base: v6-updates
Choose a base branch
from
Open

fix(build): update versions to fix build, style fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
abda779
Update to PF dependencies to latest V6
jenny-s51 Nov 27, 2023
fae9cf6
Apply V6 Code Mods
jeff-phillips-18 May 28, 2024
ad11647
Fix up after code mods
jeff-phillips-18 May 23, 2024
aa94c10
fix(build): update versions to fix build, style fixes
jenny-s51 May 31, 2024
5bfe9dd
fix(build): update to latest alphas
jenny-s51 Jun 4, 2024
1b6117b
wip token updates
jenny-s51 Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-lint-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fi
- uses: actions/setup-node@v1
with:
node-version: '14'
node-version: '16.x'
- uses: actions/cache@v2
id: yarn-cache
name: Cache npm deps
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
fi
- uses: actions/setup-node@v1
with:
node-version: '14'
node-version: '16.x'
- uses: actions/cache@v2
id: yarn-cache
name: Cache npm deps
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
fi
- uses: actions/setup-node@v1
with:
node-version: '14'
node-version: '16.x'
- uses: actions/cache@v2
id: yarn-cache
name: Cache npm deps
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
fi
- uses: actions/setup-node@v1
with:
node-version: '14'
node-version: '16.x'
- uses: actions/cache@v2
id: yarn-cache
name: Cache npm deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
if: steps.setup-cache.outputs.cache-hit != 'true'
- uses: actions/setup-node@v1
with:
node-version: '14'
node-version: '16.x'
- uses: actions/cache@v2
id: yarn-cache
name: Cache npm deps
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/check-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
pull_request:
branches:
- main
- v6
jobs:
call-build-lint-test-workflow:
uses: ./.github/workflows/build-lint-test.yml
6 changes: 3 additions & 3 deletions .github/workflows/pr-preview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
git fetch origin pull/$GH_PR_NUM/head:tmp
git checkout tmp
- run: |
git rev-parse origin/main
git rev-parse origin/v6
git rev-parse HEAD
git rev-parse origin/main..HEAD
git log origin/main..HEAD --format="%b"
git rev-parse origin/v6..HEAD
git log origin/v6..HEAD --format="%b"
# Yes, we really want to checkout the PR
# Injected by generate-workflows.js
- uses: actions/setup-node@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
push:
# Sequence of patterns matched against refs/tags
tags:
- v5.*
- v6.*
jobs:
build-and-promote:
runs-on: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- main
- v6
jobs:
call-build-lint-test-workflow:
uses: ./.github/workflows/build-lint-test.yml
Expand All @@ -16,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: '14'
node-version: '16.x'
- uses: actions/cache@v2
id: yarn-cache
name: Cache npm deps
Expand Down
3 changes: 2 additions & 1 deletion jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ module.exports = {
],
roots: ['<rootDir>/packages'],
transform: {
'^.+\\.[jt]sx?$': 'babel-jest'
'^.+\\.[jt]sx?$': 'babel-jest',
'^.+\\.svg$': 'jest-transform-stub'
},
moduleNameMapper: {
'\\.(css|less)$': '<rootDir>/styleMock.js'
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"eslint-plugin-patternfly-react": "^4.80.4",
"jest": "^29.2.2",
"jest-environment-jsdom": "^29.2.2",
"jest-transform-stub": "^2.0.0",
"prettier": "2.7.1",
"react": "^18",
"react-dom": "^18",
Expand Down
6 changes: 3 additions & 3 deletions packages/demo-app-ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"serve:demo-app": "node scripts/serve"
},
"dependencies": {
"@patternfly/react-core": "^5.1.1",
"@patternfly/react-icons": "^5.1.1",
"@patternfly/react-styles": "^5.1.1",
"@patternfly/react-core": "6.0.0-alpha.61",
"@patternfly/react-icons": "6.0.0-alpha.23",
"@patternfly/react-styles": "6.0.0-alpha.23",
"react": "^18",
"react-dom": "^18",
"react-router": "^5.3.3",
Expand Down
7 changes: 7 additions & 0 deletions packages/demo-app-ts/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,10 @@
transform: rotate(360deg);
}
}

#ts-demo-app-page-id {
flex: 1
}
.pf-v6-c-tab-content {
flex: 1;
}
6 changes: 3 additions & 3 deletions packages/demo-app-ts/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ class App extends React.Component<{}, AppState> {
const htmlElement = document.getElementsByTagName('html')[0];
if (htmlElement) {
if (isDarkTheme) {
htmlElement.classList.add('pf-v5-theme-dark');
htmlElement.classList.add('pf-v6-theme-dark');
} else {
htmlElement.classList.remove('pf-v5-theme-dark');
htmlElement.classList.remove('pf-v6-theme-dark');
}
}
};
Expand Down Expand Up @@ -120,7 +120,7 @@ class App extends React.Component<{}, AppState> {
const AppToolbar = (
<Toolbar id="toolbar" isFullHeight isStatic>
<ToolbarContent>
<ToolbarGroup align={{ default: 'alignRight' }}>
<ToolbarGroup align={{ default: 'alignEnd' }}>
<ToolbarItem style={{ marginRight: '10px' }}>
<Radio
id="light-theme"
Expand Down
52 changes: 28 additions & 24 deletions packages/demo-app-ts/src/Demo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,71 +6,75 @@
}

.pf-ri__topology-demo .pf-topology-visualization-surface {
border: 1px solid var(--pf-v5-global--BorderColor--100);
border: 1px solid var(--pf-t--global--border--color--100);
border-top: none;
}

.pf-ri__topology-demo .pf-v5-c-tab-content {
.pf-ri__topology-demo .pf-v6-c-tab-content {
display: flex;
flex-direction: column;
flex-grow: 1;
}

.pf-ri__topology-demo .pf-v5-c-tab-content:focus {
.pf-ri__topology-demo .pf-v6-c-tab-content:focus {
outline: none;
}

.pf-ri__topology-demo .pf-v5-c-toolbar {
--pf-v5-c-toolbar__expandable-content--lg--PaddingBottom: 0;
--pf-v5-c-toolbar--PaddingBottom: 0;
.pf-ri__topology-demo .pf-v6-c-toolbar {
--pf-v6-c-toolbar__expandable-content--lg--PaddingBottom: 0;
--pf-v6-c-toolbar--PaddingBottom: 0;
}
.pf-ri__topology-demo .pf-v5-c-toolbar__item .pf-v5-l-flex {
--pf-v5-l-flex--FlexWrap: no-wrap;
.pf-ri__topology-demo .pf-v6-c-toolbar__item .pf-v6-l-flex {
--pf-v6-l-flex--FlexWrap: no-wrap;
}
.pf-ri__topology-demo .pf-v5-c-toolbar__item .pf-v5-c-form-control {
.pf-ri__topology-demo .pf-v6-c-toolbar__item .pf-v6-c-form-control {
width: 70px;
}
.pf-ri-topology-context-menu {
z-index: 1050;
}

.pf-ri-topology-context-menu__kebab-wrapper.pf-v5-c-dropdown__menu-item {
.pf-ri-topology-context-menu__kebab-wrapper.pf-v6-c-dropdown__menu-item {
padding: 0;
}
.pf-ri__topology-demo__package-input {
width: 75px;
}

.pf-ri-topology__node__background {
fill: var(--pf-v5-global--palette--black-400);
fill: var(--pf-t--color--gray--40);
stroke-width: 1px;
stroke: var(--pf-v5-global--palette--black-1000);
stroke: var(--pf-t--color--black);
}

.pf-ri-topology__node__background.pf-m-selected {
fill: var(--pf-v5-global--active-color--100);
fill: var(--pf-t--color--blue--50);
}

.pf-ri-topology__node__background.pf-m-hover {
fill: var(--pf-v5-global--palette--green-300);
fill: var(--pf-t--color--green--40);
}

.pf-ri-topology__node__background.pf-m-drop-target {
fill: var(--pf-v5-global--palette--light-blue-200);
fill: var(--pf-t--color--blue--20);
}

.pf-v5-c-page__main-section#\/topology-demo-page-section,
.pf-v5-c-page__main-section#\/topology-pipelines-demo-page-section,
.pf-v5-c-page__main-section#\/topology-pipelines-groups-demo-page-section {
--pf-v5-c-page__main-section--PaddingTop: 0;
--pf-v5-c-page__main-section--PaddingRight: 0;
--pf-v5-c-page__main-section--PaddingLeft: 0;
--pf-v5-c-page__main-section--PaddingBottom: 0;
.pf-v6-c-page__main-section#\/topology-demo-page-section,
.pf-v6-c-page__main-section#\/topology-pipelines-demo-page-section,
.pf-v6-c-page__main-section#\/topology-pipelines-groups-demo-page-section {
--pf-v6-c-page__main-section--PaddingTop: 0;
--pf-v6-c-page__main-section--PaddingRight: 0;
--pf-v6-c-page__main-section--PaddingLeft: 0;
--pf-v6-c-page__main-section--PaddingBottom: 0;
}

.topology-demo-badge > rect {
fill: var(--pf-v5-global--palette--red-100);
fill: var(--pf-t--color--red--50);
}
.topology-demo-badge > text {
fill: var(--pf-v5-global--palette--gold-100);
fill: var(--pf-t--global--color--nonstatus--gold--200);
}

.pf-v6-c-toolbar__content.pf-m-hidden {
display: none;
}
4 changes: 2 additions & 2 deletions packages/demo-app-ts/src/demos/topologyPackageDemo/OptionsContextBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import {
MenuToggle,
MenuToggleElement,
Select,
SelectList,
SelectOption,
SelectList,
TextInput,
ToolbarItem,
ToolbarItem
} from '@patternfly/react-core';
import { observer } from '@patternfly/react-topology';
import { DemoContext } from './DemoContext';
Expand Down
4 changes: 2 additions & 2 deletions packages/demo-app-ts/src/demos/topologyPackageDemo/OptionsViewBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
SplitItem,
TextInput,
ToolbarItem,
Tooltip,
Tooltip
} from '@patternfly/react-core';
import { Controller, Model, observer } from '@patternfly/react-topology';
import { DemoContext } from './DemoContext';
Expand All @@ -31,7 +31,7 @@ const OptionsContextBar: React.FC<{ controller: Controller }> = observer(({ cont
const layoutDropdown = (
<Split>
<SplitItem>
<label className="pf-v5-u-display-inline-block pf-v5-u-mr-md pf-v5-u-mt-sm">Layout:</label>
<label className="pf-v6-u-display-inline-block pf-v6-u-mr-md pf-v6-u-mt-sm">Layout:</label>
</SplitItem>
<SplitItem>
<Dropdown
Expand Down
2 changes: 1 addition & 1 deletion packages/demo-app-ts/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import '@patternfly/patternfly/patternfly-theme-dark.css';
import '@patternfly/patternfly/patternfly-addons.css';

// eslint-disable-next-line react/no-deprecated
ReactDOM.render(<App />, document.getElementById('root'));
18 changes: 9 additions & 9 deletions packages/module/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@patternfly/react-topology",
"version": "0.0.0",
"version": "6.0.0-alpha.0",
"description": "Provide patternfly components, styles, and utilities for displaying a topology view",
"main": "dist/js/index.js",
"module": "dist/esm/index.js",
Expand Down Expand Up @@ -30,12 +30,12 @@
"homepage": "https://github.com/patternfly/react-topology#readme",
"publishConfig": {
"access": "public",
"tag": "prerelease"
"tag": "alpha"
},
"dependencies": {
"@patternfly/react-core": "^5.1.1",
"@patternfly/react-icons": "^5.1.1",
"@patternfly/react-styles": "^5.1.1",
"@patternfly/react-core": "6.0.0-alpha.61",
"@patternfly/react-icons": "6.0.0-alpha.23",
"@patternfly/react-styles": "6.0.0-alpha.23",
"@types/d3": "^7.4.0",
"@types/d3-force": "^1.2.1",
"@types/dagre": "0.7.42",
Expand All @@ -55,11 +55,11 @@
"react-dom": "^17 || ^18"
},
"devDependencies": {
"@patternfly/documentation-framework": "^5.2.15",
"@patternfly/patternfly": "^5.1.0",
"@patternfly/documentation-framework": "^6.0.0-alpha.41",
"@patternfly/patternfly": "6.0.0-alpha.139",
"@patternfly/patternfly-a11y": "^4.3.1",
"@patternfly/react-code-editor": "^5.1.1",
"@patternfly/react-table": "^5.1.1",
"@patternfly/react-code-editor": "6.0.0-alpha.61",
"@patternfly/react-table": "6.0.0-alpha.61",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"camel-case": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/module/patternfly-docs/content/examples/TopologyLayoutsDemo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ export const LayoutsDemo: React.FC = () => {
const layoutDropdown = (
<Split>
<SplitItem>
<label className="pf-v5-u-display-inline-block pf-v5-u-mr-md pf-v5-u-mt-sm">Layout</label>
<label className="pf-v6-u-display-inline-block pf-v6-u-mr-md pf-v6-u-mt-sm">Layout</label>
</SplitItem>
<SplitItem>
<Dropdown
Expand Down
10 changes: 5 additions & 5 deletions packages/module/patternfly-docs/content/examples/topology-example.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
.ws-extensions-t-sidebar,
.ws-extensions-t-toolbar {
height: 600px;
border: 1px solid var(--pf-v5-global--palette--black-900);
border: 1px solid var(--pf-t--color--black);
padding: 0;
margin: var(--pf-v5-global--spacer--md);
margin: var(--pf-t--global--spacer--300);
}

@media (min-width: 768px) {
Expand All @@ -33,15 +33,15 @@
.pf-theme-dark .ws-extensions-t-selection,
.pf-theme-dark .ws-extensions-t-sidebar,
.pf-theme-dark .ws-extensions-t-toolbar {
border: 1px solid var(--pf-v5-global--palette--black-100);
border: 1px solid var(--pf-t--color--gray--20);
}

.ws-extensions-t-topology .pf-v5-l-stack {
.ws-extensions-t-topology .pf-v6-l-stack {
margin: -9px;
width: calc(100% + 18px);
}

.ws-extensions-t-topology .pf-topology-view__project-toolbar .pf-v5-c-dropdown>button {
.ws-extensions-t-topology .pf-topology-view__project-toolbar .pf-v6-c-dropdown>button {
justify-content: space-between;
width: 150px;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/module/patternfly-docs/content/examples/topology-pipelines-example.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.ws-react-t-pipelines {
height: 300px;
border: 1px solid var(--pf-v5-global--palette--black-900);
border: 1px solid var(--pf-t--color--black);
padding: 0;
margin: var(--pf-v5-global--spacer--md);
margin: var(--pf-t--global--spacer--300);
}
Loading
Loading