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.

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

chore(v5-updates): Standardize on React 18, node 18, eslint, and PF v5 #43

Merged
merged 6 commits into from
May 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
- v4
jobs:
call-build-lint-test-workflow:
uses: ./.github/workflows/build-lint-test.yml
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- main
- v4
jobs:
call-build-lint-test-workflow:
uses: ./.github/workflows/build-lint-test.yml
Expand Down
3 changes: 2 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ module.exports = {
moduleNameMapper: {
'\\.(css|less)$': '<rootDir>/styleMock.js'
},
testEnvironment: 'jsdom'
testEnvironment: 'jsdom',
setupFiles: ['./jest.setup.js']
};
2 changes: 2 additions & 0 deletions jest.setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
const { TextEncoder } = require('util');
global.TextEncoder = TextEncoder;
36 changes: 21 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@patternfly/react-user-feedback-root",
"private": true,
"version": "0.0.0",
"version": "5.0.0-alpha.0",
"description": "This library provides patternfly extensions",
"license": "MIT",
"workspaces": [
Expand All @@ -26,34 +26,40 @@
"prepare": "husky install"
},
"devDependencies": {
"babel-jest": "^29.2.2",
"@babel/core": "^7.19.6",
"@babel/preset-env": "^7.19.4",
"@babel/preset-flow": "^7.18.6",
"@babel/preset-react": "^7.18.6",
"@babel/preset-flow": "^7.18.6",
"@babel/preset-typescript": "^7.18.6",
"@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "13.5.0",
"react": "^18",
"react-dom": "^18",
"typescript": "^4.7.4",
"@typescript-eslint/eslint-plugin": "^5.42.0",
"@typescript-eslint/parser": "^5.42.0",
"babel-jest": "^29.2.2",
"@types/react": "^18",
"@types/react-dom": "^18",
"concurrently": "^5.3.0",
"eslint": "^8.0.1",
"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-n": "^15.0.0",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-react": "^7.21.4",
"eslint-config-standard-with-typescript": "^23.0.0",
"eslint-plugin-n": "^15.0.0",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-react-hooks": "^4.6.0",
"husky": "^8.0.3",
"eslint-config-prettier": "8.5.0",
"prettier": "2.7.1",
"jest": "^29.2.2",
"husky": "^8.0.3",
"@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",
"prettier": "2.7.1",
"react": "^17",
"react-dom": "^17",
"serve": "^14.1.2"
"jest-canvas-mock": "^2.4.0",
"serve": "^14.1.2",
"rimraf": "^2.6.2"
}
}
35 changes: 18 additions & 17 deletions packages/module/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{
"name": "@patternfly/react-user-feedback",
"version": "1.0.0",
"version": "5.0.0-alpha.0",
"description": "A feedback extension to allow users to provide input on products.",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
"publishConfig": {
"access": "public",
"tag": "alpha"
},
"scripts": {
"build": "yarn build:js && yarn build:esm && yarn build:fed:packages && yarn copy:files:esm && yarn copy:files:cjs",
"build:esm": "tsc --build --verbose ./tsconfig.json && yarn build:css && yarn transform:css",
Expand All @@ -28,34 +32,31 @@
"url": "https://github.com/patternfly/react-user-feedback/issues"
},
"homepage": "https://github.com/patternfly/react-user-feedback#readme",
"publishConfig": {
"access": "public"
},
wise-king-sullyman marked this conversation as resolved.
Show resolved Hide resolved
"resolutions": {
"@patternfly/react-icons": "^4.93.6"
},
"dependencies": {
"@patternfly/react-core": "^4.276.6",
"@patternfly/react-icons": "^4.93.6"
"@patternfly/react-core": "^5.0.0-alpha.50",
"@patternfly/react-icons": "^5.0.0-alpha.7"
},
"peerDependencies": {
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
"react": "^17 || ^18",
"react-dom": "^17 || ^18"
},
"devDependencies": {
"copyfiles": "2.4.1",
"utility-types": "^3.10.0",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"react": "^18",
"react-dom": "^18",
"rimraf": "^2.6.2",
"typescript": "^4.7.4",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@patternfly/patternfly-a11y": "4.3.1",
"@patternfly/documentation-framework": "^1.2.55",
"@patternfly/patternfly": "^4.224.2",
"@patternfly/react-table": "^4.112.39",
"@patternfly/react-code-editor": "^4.82.113",
"@types/react": "^18",
"@types/react-dom": "^18",
"@patternfly/patternfly-a11y": "^4.3.1",
"@patternfly/documentation-framework": "^2.0.0-alpha.31",
"@patternfly/patternfly": "^5.0.0-alpha.33",
"@patternfly/react-table": "^5.0.0-alpha.51",
"@patternfly/react-code-editor": "^5.0.0-alpha.51",
"node-sass-package-importer": "^5.3.2",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand Down
5 changes: 3 additions & 2 deletions packages/module/release.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
branches: [{ name: 'main', channel: 'prerelease' }],
branches: [{ name: 'v4', channel: 'prerelease' }, { name: 'main', channel: 'alpha', prerelease: 'alpha' }],
analyzeCommits: {
preset: 'angular'
},
Expand All @@ -9,5 +9,6 @@ module.exports = {
'@semantic-release/github',
'@semantic-release/npm'
],
tagFormat: 'v${version}'
tagFormat: 'v${version}',
dryRun: true
};
2 changes: 1 addition & 1 deletion packages/module/src/Feedback/FeedbackError.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const FeedbackError = ({ onCloseModal }: FeedbackErrorProps) => {
const intl = React.useContext(LocaleContext);
return (
<div className="chr-c-feedback-success-content">
<CheckIcon size="md" color="var(--pf-global--success-color--100)" className="pf-u-mx-auto" />
<CheckIcon color="var(--pf-global--success-color--100)" className="pf-u-mx-auto" />
<TextContent>
<Text component={TextVariants.h1}>{intl.somethingWentWrong}</Text>
<Text>
Expand Down
2 changes: 1 addition & 1 deletion packages/module/src/Feedback/FeedbackSuccess.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const FeedbackSuccess = ({ onCloseModal, successTitle, successDescription }: Fee
const intl = React.useContext(LocaleContext);
return (
<div className="chr-c-feedback-success-content">
<CheckIcon size="md" color="var(--pf-global--success-color--100)" className="pf-u-mx-auto" />
<CheckIcon color="var(--pf-global--success-color--100)" className="pf-u-mx-auto" />
<TextContent>
<Text component={TextVariants.h1}>{successTitle}</Text>
<Text>{successDescription}</Text>
Expand Down
Loading