Skip to content

Commit 016baea

Browse files
authored
Merge pull request #17 from patternfly/v5-updates
fix(v5): Upgraded to PF v5
2 parents 4c86c2b + 14fb4ee commit 016baea

File tree

16 files changed

+6437
-36075
lines changed

16 files changed

+6437
-36075
lines changed

.cache_zqijbm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorBoundary/ErrorBoundary.tsx":"1","/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorBoundary/ErrorStack.tsx":"2","/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorBoundary/index.ts":"3","/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorState/DefaultErrorMessage.tsx":"4","/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorState/ErrorState.tsx":"5","/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorState/index.ts":"6","/Users/dlabaj/repos/react-component-groups/packages/module/src/NotAuthorized/NotAuthorized.tsx":"7","/Users/dlabaj/repos/react-component-groups/packages/module/src/NotAuthorized/index.ts":"8","/Users/dlabaj/repos/react-component-groups/packages/module/src/index.ts":"9"},{"size":2074,"mtime":1679316214554,"results":"10","hashOfConfig":"11"},{"size":1237,"mtime":1679316214555,"results":"12","hashOfConfig":"11"},{"size":60,"mtime":1679316214555,"results":"13","hashOfConfig":"11"},{"size":404,"mtime":1675096338736,"results":"14","hashOfConfig":"11"},{"size":1860,"mtime":1685547240249,"results":"15","hashOfConfig":"11"},{"size":126,"mtime":1679316214556,"results":"16","hashOfConfig":"11"},{"size":2226,"mtime":1685547240249,"results":"17","hashOfConfig":"11"},{"size":103,"mtime":1675096338738,"results":"18","hashOfConfig":"11"},{"size":63,"mtime":1685465904320,"results":"19","hashOfConfig":"11"},{"filePath":"20","messages":"21","suppressedMessages":"22","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"sqltza",{"filePath":"23","messages":"24","suppressedMessages":"25","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"26","messages":"27","suppressedMessages":"28","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"29","messages":"30","suppressedMessages":"31","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"32","messages":"33","suppressedMessages":"34","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"35","messages":"36","suppressedMessages":"37","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"38","messages":"39","suppressedMessages":"40","errorCount":0,"fatalErrorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"41","messages":"42","suppressedMessages":"43","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"44","messages":"45","suppressedMessages":"46","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorBoundary/ErrorBoundary.tsx",[],[],"/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorBoundary/ErrorStack.tsx",[],[],"/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorBoundary/index.ts",[],[],"/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorState/DefaultErrorMessage.tsx",[],[],"/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorState/ErrorState.tsx",[],[],"/Users/dlabaj/repos/react-component-groups/packages/module/src/ErrorState/index.ts",[],[],"/Users/dlabaj/repos/react-component-groups/packages/module/src/NotAuthorized/NotAuthorized.tsx",["47"],[],"/Users/dlabaj/repos/react-component-groups/packages/module/src/NotAuthorized/index.ts",[],[],"/Users/dlabaj/repos/react-component-groups/packages/module/src/index.ts",[],[],{"ruleId":null,"message":"48","line":8,"column":3,"endLine":8,"endColumn":65,"severity":1,"nodeType":null},"'//eslint-disable-next-line' has no effect because you have 'noInlineConfig' setting in your config (BaseConfig)."]

.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+
- v5
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+
- v5
67
jobs:
78
call-build-lint-test-workflow:
89
uses: ./.github/workflows/build-lint-test.yml

config/setupTests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-unused-vars */
22
import { configure } from 'enzyme';
3-
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
3+
import Adapter from '@cfaester/enzyme-adapter-react-18';
44
import 'whatwg-fetch';
55
import 'babel-polyfill';
66
import '@testing-library/jest-dom';

jest.config.js

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,18 @@
1-
// Sync object
2-
/** @type {import('@jest/types').Config.InitialOptions} */
3-
4-
const config = {
5-
verbose: true,
6-
coverageDirectory: './coverage/',
7-
collectCoverage: true,
8-
transformIgnorePatterns: [
9-
'node_modules/(?!@patternfly|@data-driven-forms)',
10-
11-
// Uncomment the below line if you face any errors with jest
12-
// '/node_modules/(?!@redhat-cloud-services)',
13-
],
14-
collectCoverageFrom: [
15-
'<rootDir>/packages/**/src/**/*.js',
16-
'!<rootDir>/packages/**/stories/*',
17-
'!<rootDir>/packages/**/index.js',
18-
'!<rootDir>/packages/**/*{c|C}ontext*.js',
19-
'!<rootDir>/packages/components/src/Components/Table/*',
20-
],
21-
setupFilesAfterEnv: [ '<rootDir>/config/setupTests.js', 'jest-canvas-mock' ],
22-
testEnvironment: 'jsdom',
23-
roots: [ '<rootDir>/packages/' ],
24-
// modulePathIgnorePatterns: ['<rootDir>/packages/create-crc-app/templates', '<rootDir>/packages/docs/.cache'],
1+
module.exports = {
2+
clearMocks: true,
3+
testMatch: ['**/__tests__/**/*.{js,ts}?(x)', '**/*.test.{js,ts}?(x)'],
254
modulePathIgnorePatterns: [
265
'<rootDir>/packages/*.*/dist/*.*',
276
'<rootDir>/packages/*.*/public/*.*',
287
'<rootDir>/packages/*.*/.cache/*.*'
298
],
30-
moduleNameMapper: {
31-
'\\.(css|scss)$': 'identity-obj-proxy',
32-
'^lodash-es$': 'lodash',
33-
customReact: 'react',
34-
reactRedux: 'react-redux',
35-
PFReactCore: '@patternfly/react-core',
36-
PFReactTable: '@patternfly/react-table',
37-
},
38-
testURL: 'http://localhost:5000/',
39-
globalSetup: '<rootDir>/config/globalSetup.js',
9+
roots: ['<rootDir>/packages'],
4010
transform: {
41-
'^.+\\.jsx?$': 'babel-jest',
42-
'^.+\\.tsx?$': 'ts-jest',
11+
'^.+\\.[jt]sx?$': 'babel-jest'
4312
},
44-
globals: {
45-
'ts-jest': {
46-
tsconfig: './packages/module/tsconfig.json',
47-
},
13+
moduleNameMapper: {
14+
'\\.(css|less)$': '<rootDir>/styleMock.js'
4815
},
16+
testEnvironment: 'jsdom',
17+
setupFiles: ['./jest.setup.js']
4918
};
50-
51-
module.exports = config;

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;

0 commit comments

Comments
 (0)