Skip to content

Commit 2cacf72

Browse files
Merge pull request #22 from patternfly/v5
feat(v5): Update to import pf v5 alphas and release a v5 alpha
2 parents dc17a41 + 8baf085 commit 2cacf72

File tree

12 files changed

+160
-186
lines changed

12 files changed

+160
-186
lines changed

.github/workflows/check-pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
pull_request:
44
branches:
55
- main
6+
- v4
67
jobs:
78
call-build-lint-test-workflow:
89
uses: ./.github/workflows/build-lint-test.yml

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- main
6+
- v4
67
jobs:
78
call-build-lint-test-workflow:
89
uses: ./.github/workflows/build-lint-test.yml

jest.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ module.exports = {
1313
moduleNameMapper: {
1414
'\\.(css|less)$': '<rootDir>/styleMock.js'
1515
},
16-
testEnvironment: 'jsdom'
16+
testEnvironment: 'jsdom',
17+
setupFiles: ['./jest.setup.js']
1718
};

jest.setup.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
const { TextEncoder } = require('util');
2+
global.TextEncoder = TextEncoder;

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
"serve:a11y": "yarn workspace @patternfly/react-log-viewer serve:a11y"
2222
},
2323
"devDependencies": {
24-
"react": "^17",
25-
"react-dom": "^17",
24+
"react": "^18",
25+
"react-dom": "^18",
2626
"typescript": "^4.7.4",
2727
"@typescript-eslint/eslint-plugin": "^5.42.0",
2828
"@typescript-eslint/parser": "^5.42.0",
29-
"@types/react": "^17",
30-
"@types/react-dom": "^17",
29+
"@types/react": "^18",
30+
"@types/react-dom": "^18",
3131
"concurrently": "^5.3.0",
3232
"eslint": "^8.0.1",
3333
"eslint-plugin-import": "^2.25.2",
@@ -47,9 +47,9 @@
4747
"@babel/preset-react": "^7.18.6",
4848
"@babel/preset-flow": "^7.18.6",
4949
"@babel/preset-typescript": "^7.18.6",
50-
"@testing-library/react": "^12.1.5",
51-
"@testing-library/user-event": "13.5.0",
52-
"@testing-library/jest-dom": "5.16.5",
50+
"@testing-library/react":"^13.4.0",
51+
"@testing-library/user-event": "14.4.3",
52+
"@testing-library/jest-dom":"5.16.5",
5353
"@testing-library/dom": "9.0.0",
5454
"jest-environment-jsdom": "^29.2.2",
5555
"jest-canvas-mock": "^2.4.0",

packages/module/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@patternfly/react-log-viewer",
3-
"version": "4.87.97",
3+
"version": "5.0.0-alpha.0",
44
"description": "Terminal renderer",
55
"main": "dist/js/index.js",
66
"module": "dist/esm/index.js",
77
"publishConfig": {
88
"access": "public",
9-
"tag": "prerelease"
9+
"tag": "alpha"
1010
},
1111
"scripts": {
1212
"build": "yarn build:esm && yarn build:cjs",
@@ -28,9 +28,9 @@
2828
},
2929
"homepage": "https://github.com/patternfly/react-log-viewer#readme",
3030
"dependencies": {
31-
"@patternfly/react-core": "^4.276.6",
32-
"@patternfly/react-icons": "^4.93.6",
33-
"@patternfly/react-styles": "^4.92.6",
31+
"@patternfly/react-core": "^5.0.0-alpha.50",
32+
"@patternfly/react-icons": "^5.0.0-alpha.7",
33+
"@patternfly/react-styles": "^5.0.0-alpha.5",
3434
"memoize-one": "^5.1.0",
3535
"monaco-editor": "^0.33.0"
3636

@@ -40,11 +40,11 @@
4040
"react-dom": "^16.8 || ^17 || ^18"
4141
},
4242
"devDependencies": {
43-
"@patternfly/documentation-framework": "^1.8.0",
44-
"@patternfly/patternfly": "^4.224.2",
45-
"@patternfly/react-table": "^4.112.39",
43+
"@patternfly/documentation-framework": "^2.0.0-alpha.12",
44+
"@patternfly/patternfly": "^5.0.0-alpha.37",
45+
"@patternfly/react-table": "^5.0.0-alpha.51",
4646
"@patternfly/patternfly-a11y": "^4.3.1",
47-
"@patternfly/react-code-editor": "^4.82.113",
47+
"@patternfly/react-code-editor": "^5.0.0-alpha.51",
4848
"resize-observer-polyfill": "^1.5.1",
4949
"tslib": "^2.0.0",
5050
"react-monaco-editor": "^0.51.0"

packages/module/patternfly-docs/generated/extensions/log-viewer/design-guidelines.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const pageData = {
1010
"section": "extensions",
1111
"subsection": "",
1212
"source": "design-guidelines",
13-
"tabName": null,
1413
"slug": "/extensions/log-viewer/design-guidelines",
1514
"sourceLink": "https://github.com/patternfly/patternfly-org/blob/main/packages/module/patternfly-docs/content/extensions/react-log-viewer/design-guidelines/design-guidelines.md",
1615
"relPath": "packages/module/patternfly-docs/content/extensions/react-log-viewer/design-guidelines/design-guidelines.md"

packages/module/patternfly-docs/generated/extensions/log-viewer/react-demos.js

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/module/patternfly-docs/generated/extensions/log-viewer/react.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ const pageData = {
88
"section": "extensions",
99
"subsection": "",
1010
"source": "react",
11-
"tabName": null,
1211
"slug": "/extensions/log-viewer/react",
1312
"sourceLink": "https://github.com/patternfly/patternfly-react/blob/main/packages/module/patternfly-docs/content/extensions/react-log-viewer/examples/basic.md",
1413
"relPath": "packages/module/patternfly-docs/content/extensions/react-log-viewer/examples/basic.md",

packages/module/patternfly-docs/generated/index.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ module.exports = {
77
section: "extensions",
88
subsection: "",
99
source: "react-demos",
10-
tabName: null,
1110
Component: () => import(/* webpackChunkName: "extensions/log-viewer/react-demos/index" */ './extensions/log-viewer/react-demos')
1211
},
1312
'/extensions/log-viewer/design-guidelines': {
@@ -17,7 +16,6 @@ module.exports = {
1716
section: "extensions",
1817
subsection: "",
1918
source: "design-guidelines",
20-
tabName: null,
2119
Component: () => import(/* webpackChunkName: "extensions/log-viewer/design-guidelines/index" */ './extensions/log-viewer/design-guidelines')
2220
},
2321
'/extensions/log-viewer/react': {
@@ -28,7 +26,6 @@ module.exports = {
2826
section: "extensions",
2927
subsection: "",
3028
source: "react",
31-
tabName: null,
3229
Component: () => import(/* webpackChunkName: "extensions/log-viewer/react/index" */ './extensions/log-viewer/react')
3330
}
3431
};

0 commit comments

Comments
 (0)