Skip to content

Commit 321d643

Browse files
redallenevwilkin
authored andcommitted
build(v4): fix build on v4 (patternfly#3915)
* fix hoist-non-react-statics types * also verify @patternfly package versions * run verify script with --fix * fix hoist-non-react-statics declaration * fix linting errors * fix drawer panel style * update snapshots
1 parent 4fb5582 commit 321d643

File tree

2 files changed

+15
-118
lines changed

2 files changed

+15
-118
lines changed

scripts/verifyPatternflyVersions.js

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function setDependency(dependencies, package, version) {
2525
}
2626

2727
async function verifyPatternflyVersions() {
28-
const packages = await new Project(__dirname).getPackages();
28+
const packages = (await new Project(__dirname).getPackages());
2929

3030
packages.forEach(package => {
3131
accumulateDependencies(package.name, { [package.name]: `^${package.version}` });
@@ -34,21 +34,18 @@ async function verifyPatternflyVersions() {
3434
});
3535

3636
let failed = false;
37-
const mismatchedVersions = Object.entries(patternflyDeps).filter(
38-
([_dep, versions]) => Object.keys(versions).length > 1
39-
);
40-
37+
const mismatchedVersions = Object.entries(patternflyDeps)
38+
.filter(([_dep, versions]) => Object.keys(versions).length > 1);
39+
4140
mismatchedVersions.forEach(([dep, versions]) => {
42-
failed = true;
43-
console.error(`Mismatching versions for ${dep}:`);
44-
Object.entries(versions).forEach(([version, packages]) => console.error(`${version}: ${packages.join(' ')}`));
45-
});
46-
41+
failed = true;
42+
console.error(`Mismatching versions for ${dep}:`);
43+
Object.entries(versions).forEach(([version, packages]) => console.error(`${version}: ${packages.join(' ')}`));
44+
});
45+
4746
if (process.argv[2] === '--fix') {
4847
mismatchedVersions.forEach(([dep, versions]) => {
49-
const highestVersion = Object.keys(versions)
50-
.sort()
51-
.reverse()[0];
48+
const highestVersion = Object.keys(versions).sort().reverse()[0];
5249
Object.keys(versions)
5350
.filter(version => version !== highestVersion)
5451
.map(version => versions[version])

yarn.lock

Lines changed: 5 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -3380,6 +3380,7 @@
33803380
<<<<<<< HEAD
33813381
<<<<<<< HEAD
33823382
<<<<<<< HEAD
3383+
<<<<<<< HEAD
33833384
"@patternfly/patternfly@4.0.4":
33843385
version "4.0.4"
33853386
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-4.0.4.tgz#b4ba2db3d958c15a610e694a96d975e57e5a1db6"
@@ -3396,127 +3397,26 @@
33963397
integrity sha512-ZsANYyp/AVRaSWAFBnKuoyvVoA1tMT7hh1jHpua0sQYjN4ocuN89MNcNdAJhdawt1Bh+p9OEtDgl4vfKQbJ9RQ==
33973398
>>>>>>> feat(FileUpload) Add new beta File Upload component (#3865)
33983399
=======
3400+
=======
3401+
>>>>>>> build(v4): fix build on v4 (#3915)
33993402
"@patternfly/patternfly@2.70.1":
34003403
version "2.70.1"
34013404
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-2.70.1.tgz#ef5f9b7912313b873d128002152106c1a5f86b42"
34023405
integrity sha512-vimiUQRX0SdaxFKOWaFQ9Gcva/cnEWl4R9SNx1837TRBonLTyTKmzuDRuaDF09ximiRQyWB08/WLESJLLrEF+A==
34033406
>>>>>>> chore(repo): bump core to 2.70.1 (#3964)
34043407

3408+
=======
3409+
>>>>>>> build(v4): fix build on v4 (#3915)
34053410
"@patternfly/patternfly@4.0.4":
34063411
version "4.0.4"
34073412
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-4.0.4.tgz#b4ba2db3d958c15a610e694a96d975e57e5a1db6"
34083413
integrity sha512-ABfuvG0y0Z12Jtd8bxsfjWc9yt9jtQyWonuC0AKRktvn9bFULr7vWJ3Lg+PIXP5WUefPD7D+vGTz8SxdbWgLDA==
34093414

3410-
"@patternfly/react-catalog-view-extension@^1.4.21":
3411-
version "1.4.21"
3412-
resolved "https://registry.yarnpkg.com/@patternfly/react-catalog-view-extension/-/react-catalog-view-extension-1.4.21.tgz#068a89c4c7d257799c8d589f0a608d106975c749"
3413-
integrity sha512-KewwyApsxDmzKol+mQDYVLUwhKZ2VENR2BIUW1cHmdLF/YgLl9l5XpJREAqxgdqhPubRjH6HivSrwUr8VOzX8w==
3414-
dependencies:
3415-
"@patternfly/patternfly" "2.65.3"
3416-
"@patternfly/react-core" "^3.142.2"
3417-
"@patternfly/react-styles" "^3.7.6"
3418-
classnames "^2.2.5"
3419-
patternfly "^3.59.4"
3420-
3421-
"@patternfly/react-core@^3.142.2":
3422-
version "3.142.2"
3423-
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-3.142.2.tgz#aaab6f9b13c3b0e87380600ec213be5ad226b6a7"
3424-
integrity sha512-+Tnc8mfFz+H+zioYB1SmdLvlPmvnVQX51w6RKP10AEvDgddML8i9g04QkkNb/AwwnIuGcF95b7YgzQc00cfNrA==
3425-
dependencies:
3426-
"@patternfly/react-icons" "^3.15.5"
3427-
"@patternfly/react-styles" "^3.7.6"
3428-
"@patternfly/react-tokens" "^2.8.6"
3429-
emotion "^9.2.9"
3430-
exenv "^1.2.2"
3431-
focus-trap-react "^4.0.1"
3432-
tippy.js "5.1.2"
3433-
3434-
"@patternfly/react-inline-edit-extension@^2.17.21":
3435-
version "2.17.21"
3436-
resolved "https://registry.yarnpkg.com/@patternfly/react-inline-edit-extension/-/react-inline-edit-extension-2.17.21.tgz#194f52d6bbcadd0cadd64cc6561be28a99dd01fc"
3437-
integrity sha512-xm3wf0nwW5KEZKMb4HNfTjYsC8dSGQKGkOP4sXF9+2acLpj13I4V1BBj0nzUMvvnPE8xDeDzYh0oB42whfpeXw==
3438-
dependencies:
3439-
"@patternfly/patternfly" "2.65.3"
3440-
"@patternfly/react-core" "^3.142.2"
3441-
"@patternfly/react-icons" "^3.15.5"
3442-
"@patternfly/react-styles" "^3.7.6"
3443-
"@patternfly/react-table" "^2.28.2"
3444-
classnames "^2.2.5"
3445-
exenv "^1.2.2"
3446-
reactabular-table "^8.14.0"
3447-
optionalDependencies:
3448-
"@patternfly/react-tokens" "^2.8.6"
3449-
3450-
"@patternfly/react-styled-system@^3.8.8":
3451-
version "3.8.8"
3452-
resolved "https://registry.yarnpkg.com/@patternfly/react-styled-system/-/react-styled-system-3.8.8.tgz#85ce43ffa5c49832576dd66fa4f51c0c30ecfe81"
3453-
integrity sha512-syZIHNmjJ7OaDTPP5CYrTB2AV52VY0AQAnbJZVtKpV1ySQXbju/eNAFhmcq41FhCcDAHsvsk5zs8wVAPAMNDeQ==
3454-
dependencies:
3455-
"@patternfly/react-styles" "^3.7.6"
3456-
"@patternfly/react-tokens" "^2.8.6"
3457-
emotion-theming "^9.2.9"
3458-
react-emotion "^9.2.9"
3459-
styled-system "^3.1.11"
3460-
optionalDependencies:
3461-
"@types/styled-system" "^3.0.7"
3462-
3463-
"@patternfly/react-styles@^3.7.6":
3464-
version "3.7.6"
3465-
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-3.7.6.tgz#86b151688089ff049ab42a60eba71de50731686b"
3466-
integrity sha512-ISwqNcpq6WI82trer/fJxRdDnxYjDsGds6SV4TBv/Z919zQSQAIomw6UAO/fFMsmkTzSriGYQz3pZaLtVNtpJw==
3467-
dependencies:
3468-
camel-case "^3.0.0"
3469-
css "^2.2.3"
3470-
cssstyle "^0.3.1"
3471-
emotion "^9.2.9"
3472-
emotion-server "^9.2.9"
3473-
3474-
"@patternfly/react-table@^2.28.2":
3475-
version "2.28.2"
3476-
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-2.28.2.tgz#82cafa099b6e6439ab08fcb16db216eb1ac1570f"
3477-
integrity sha512-axCwXooClL1ZKFQYO3vDtblOrWpnZ2LksusXjFrTSsLh89AZDXxehqD+PFCtetEbeqODl9wklwKi+mUTLH5v+w==
3478-
dependencies:
3479-
"@patternfly/patternfly" "2.65.3"
3480-
"@patternfly/react-core" "^3.142.2"
3481-
"@patternfly/react-icons" "^3.15.5"
3482-
"@patternfly/react-styles" "^3.7.6"
3483-
"@patternfly/react-tokens" "^2.8.6"
3484-
classnames "^2.2.5"
3485-
exenv "^1.2.2"
3486-
lodash "^4.17.15"
3487-
34883415
"@patternfly/react-tokens@^2.8.6":
34893416
version "2.8.6"
34903417
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-2.8.6.tgz#dbdf91e354814d2efc3e7409d6161cc7eb926e8c"
34913418
integrity sha512-3GtE1o0NF4V2by4VK2mgpF1jWQCkbWzA5WyOSkhcCYUDerLhlarfuRWJrUOugM6ZmIDEOtrqRuXyXgfEjJFIqQ==
34923419

3493-
"@patternfly/react-topology@^2.14.21":
3494-
version "2.14.21"
3495-
resolved "https://registry.yarnpkg.com/@patternfly/react-topology/-/react-topology-2.14.21.tgz#f1f568bebef3769a595f933c41e0aafa8aaf4cc9"
3496-
integrity sha512-QmEgLtdZeeSm4/rogUm+YslCr947vOl27TqvNjdy857zcPTDpzpBkMsa4o0MGI7KIZOzfDYKwKTVOUDt3Wsbhw==
3497-
dependencies:
3498-
"@patternfly/patternfly" "2.65.3"
3499-
"@patternfly/react-core" "^3.142.2"
3500-
"@patternfly/react-icons" "^3.15.5"
3501-
"@patternfly/react-styles" "^3.7.6"
3502-
3503-
"@patternfly/react-virtualized-extension@^1.4.22":
3504-
version "1.4.22"
3505-
resolved "https://registry.yarnpkg.com/@patternfly/react-virtualized-extension/-/react-virtualized-extension-1.4.22.tgz#7f32123f934fd6f51cf5a77ca89054f7e67d05ec"
3506-
integrity sha512-cBSmxRnEgq9VPAIqDr7AZkzLfhtBKNsz7GE6MMyeRier7w5UbC7EvXnKMQhOxAL1ZvF9eH/NmU204uuzF3vqdA==
3507-
dependencies:
3508-
"@patternfly/patternfly" "2.65.3"
3509-
"@patternfly/react-core" "^3.142.2"
3510-
"@patternfly/react-icons" "^3.15.5"
3511-
"@patternfly/react-styles" "^3.7.6"
3512-
"@types/react-virtualized" "^9.21.5"
3513-
clsx "^1.0.1"
3514-
dom-helpers "^2.4.0 || ^3.0.0"
3515-
exenv "^1.2.2"
3516-
linear-layout-vector "0.0.1"
3517-
react-lifecycles-compat "^3.0.4"
3518-
react-virtualized "^9.21.1"
3519-
35203420
"@pieh/friendly-errors-webpack-plugin@1.7.0-chalk-2":
35213421
version "1.7.0-chalk-2"
35223422
resolved "https://registry.yarnpkg.com/@pieh/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0-chalk-2.tgz#2e9da9d3ade9d18d013333eb408c457d04eabac0"

0 commit comments

Comments
 (0)