Skip to content

Commit

Permalink
Merge branch 'patternfly:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
wise-king-sullyman authored Nov 18, 2024
2 parents a12bfe0 + b44d817 commit 82e0d61
Show file tree
Hide file tree
Showing 25 changed files with 2,315 additions and 628 deletions.
2 changes: 1 addition & 1 deletion .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@v3
with:
node-version: '16'
node-version: '18'
- 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@v3
with:
node-version: '16'
node-version: '18'
- uses: actions/cache@v2
id: yarn-cache
name: Cache npm deps
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/check-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
pull_request:
branches:
- main
- v4
jobs:
call-build-lint-test-workflow:
uses: ./.github/workflows/build-lint-test.yml
16 changes: 0 additions & 16 deletions .github/workflows/extensions.xml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/new_issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Process new issues
on:
issues:
types:
- opened

jobs:
add-to-project:
name: Add issue to project
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
project-url: https://github.com/orgs/patternfly/projects/7
github-token: ${{ secrets.GH_PROJECTS }}
label-issue:
runs-on: ubuntu-latest
steps:
- name: Team Membership Checker
# You may pin to the exact commit or the version.
# uses: TheModdingInquisition/actions-team-membership@a69636a92bc927f32c3910baac06bacc949c984c
uses: TheModdingInquisition/[email protected]
with:
# Repository token. GitHub Action token is used by default(recommended). But you can also use the other token(e.g. personal access token).
token: ${{ secrets.GH_READ_ORG_TOKEN }}
# The team to check for.
team: 'frequent-flyers'
# The organization of the team to check for. Defaults to the context organization.
organization: 'patternfly'
# If the action should exit if the user is not part of the team.
exit: true

- name: Add label if user is a team member
run: |
curl -X POST \
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-H "Accept: application/vnd.github.v3+json" \
https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels \
-d '{"labels":["PF Team"]}'
4 changes: 2 additions & 2 deletions .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 All @@ -17,7 +17,7 @@ jobs:
run: yarn install --frozen-lockfile && yarn build
- uses: actions/setup-node@v3
with:
node-version: '16.x'
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'
- name: GitHub Tag Name example
run: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
push:
branches:
- main
- v4
jobs:
call-build-lint-test-workflow:
uses: ./.github/workflows/build-lint-test.yml
Expand All @@ -17,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'
- uses: actions/cache@v2
id: yarn-cache
name: Cache npm deps
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# React Log Viewer

Live docs available on [patternfly.org](https://www.patternfly.org/v4/extensions/log-viewer)

Live docs available on [patternfly.org](https://www.patternfly.org/extensions/log-viewer)
To run the documentation locally, clone this repo and run:
```bash
yarn install && yarn build && yarn start
Expand Down
29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,15 @@
"serve:a11y": "yarn workspace @patternfly/react-log-viewer serve:a11y"
},
"devDependencies": {
"react": "^18",
"react-dom": "^18",
"typescript": "^4.7.4",
"@babel/core": "^7.19.6",
"@babel/preset-env": "^7.19.4",
"@babel/preset-react": "^7.18.6",
"@babel/preset-flow": "^7.18.6",
"@babel/preset-typescript": "^7.18.6",
"@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",
"@typescript-eslint/eslint-plugin": "^5.42.0",
"@typescript-eslint/parser": "^5.42.0",
"@types/react": "^18",
Expand All @@ -43,18 +49,13 @@
"prettier": "2.7.1",
"jest": "^29.2.2",
"babel-jest": "^29.2.2",
"@babel/core": "^7.19.6",
"@babel/preset-env": "^7.19.4",
"@babel/preset-react": "^7.18.6",
"@babel/preset-flow": "^7.18.6",
"@babel/preset-typescript": "^7.18.6",
"@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",
"jest-environment-jsdom": "^29.2.2",
"jest-canvas-mock": "^2.4.0",
"react": "^18",
"react-dom": "^18",
"rimraf": "^2.6.2",
"serve": "^14.1.2",
"rimraf": "^2.6.2"
}
"typescript": "^4.7.4"
},
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
22 changes: 12 additions & 10 deletions packages/module/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@patternfly/react-log-viewer",
"version": "0.0.0",
"version": "6.0.0-prerelease.0",
"description": "Terminal renderer",
"main": "dist/js/index.js",
"module": "dist/esm/index.js",
Expand All @@ -9,7 +9,7 @@
"tag": "prerelease"
},
"scripts": {
"build": "yarn build:esm && yarn build:cjs",
"build": "yarn generate && yarn build:esm && yarn build:cjs",
"build:watch": "npm run build:esm -- --watch",
"build:esm": "tsc --build --verbose ./tsconfig.json",
"build:cjs": "tsc --build --verbose ./tsconfig.cjs.json",
Expand All @@ -18,6 +18,7 @@
"docs:build": "pf-docs-framework build all --output public",
"docs:serve": "pf-docs-framework serve public --port 5001",
"docs:screenshots": "pf-docs-framework screenshots --urlPrefix http://localhost:5000",
"generate": "yarn clean && node scripts/writeClassMaps.js",
"test:a11y": "patternfly-a11y --config patternfly-a11y.config",
"serve:a11y": "yarn serve coverage"
},
Expand All @@ -29,24 +30,25 @@
},
"homepage": "https://github.com/patternfly/react-log-viewer#readme",
"dependencies": {
"@patternfly/react-core": "^5.0.0",
"@patternfly/react-icons": "^5.0.0",
"@patternfly/react-styles": "^5.0.0",
"@patternfly/react-core": "^6.0.0",
"@patternfly/react-icons": "^6.0.0",
"@patternfly/react-styles": "^6.0.0",
"memoize-one": "^5.1.0"
},
"peerDependencies": {
"react": "^17 || ^18",
"react-dom": "^17 || ^18"
},
"devDependencies": {
"@patternfly/documentation-framework": "^5.0.15",
"@patternfly/patternfly": "^5.0.0",
"@patternfly/react-table": "^5.0.0",
"@patternfly/documentation-framework": "^6.0.0-alpha.120",
"@patternfly/patternfly": "^6.0.0",
"@patternfly/react-table": "^6.0.0",
"@patternfly/patternfly-a11y": "^4.3.1",
"@patternfly/react-code-editor": "^5.0.0",
"@patternfly/react-code-editor": "^6.0.0",
"resize-observer-polyfill": "^1.5.1",
"tslib": "^2.0.0",
"react-monaco-editor": "^0.51.0",
"monaco-editor": "^0.34.1"
"monaco-editor": "^0.34.1",
"camel-case": "^3.0.0"
}
}
Loading

0 comments on commit 82e0d61

Please sign in to comment.