Skip to content

Commit

Permalink
Update to PF dependencies to latest V6
Browse files Browse the repository at this point in the history
  • Loading branch information
jenny-s51 authored and jeff-phillips-18 committed May 23, 2024
1 parent c089767 commit abda779
Show file tree
Hide file tree
Showing 20 changed files with 1,607 additions and 509 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-lint-test.yml
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
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
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
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
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
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
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
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
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.26",
"@patternfly/react-icons": "^6.0.0-alpha.11",
"@patternfly/react-styles": "^6.0.0-alpha.11",
"react": "^18",
"react-dom": "^18",
"react-router": "^5.3.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/demo-app-ts/src/App.tsx
Original file line number Diff line number Diff line change
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
16 changes: 8 additions & 8 deletions packages/module/package.json
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.26",
"@patternfly/react-icons": "^6.0.0-alpha.11",
"@patternfly/react-styles": "^6.0.0-alpha.11",
"@types/d3": "^7.4.0",
"@types/d3-force": "^1.2.1",
"@types/dagre": "0.7.42",
Expand All @@ -56,10 +56,10 @@
},
"devDependencies": {
"@patternfly/documentation-framework": "^5.2.15",
"@patternfly/patternfly": "^5.1.0",
"@patternfly/patternfly": "^6.0.0-alpha.74",
"@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.26",
"@patternfly/react-table": "^6.0.0-alpha.26",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"camel-case": "^3.0.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/module/release.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module.exports = {
branches: [
'do-not-delete',
{ name: 'v4', channel: 'prerelease-v4', range: '4.x' },
{ name: 'main', channel: 'prerelease', prerelease: 'prerelease' }
{ name: 'main', channel: 'alpha', prerelease: 'alpha' },
{ name: 'v6', channel: 'prerelease-v6', range: '6.x' }
],
analyzeCommits: {
preset: 'angular'
Expand All @@ -22,5 +22,6 @@ module.exports = {
'@semantic-release/github',
'@semantic-release/npm'
],
tagFormat: 'prerelease-v${version}'
tagFormat: 'prerelease-v${version}',
dryRun: true
};
Loading

0 comments on commit abda779

Please sign in to comment.