Skip to content

Commit 86a4715

Browse files
redallendgutride
redallen
authored and
dgutride
committed
chore(upgrade): Update React 16.4 (mixed versions) to React 16.8 (#1541)
* don't render typescript props in docs * add regex scripts * lock enzyme deps * format build commands * lock typescript version * Upgrade to React 16.8 * Update tests for new Enzyme adapter * Update snapshots * Fix pf3 doc build * Fix duallist test for Travis * fix docbuild * bump yarn.lock * gitignore prettier files * fix rebased snapshot, might as well have merged * downgrade tippy to fix application launcher * Readd commitizen * fix .gitignore * remove commented code * fix gatsby ts docs
1 parent 5abfbdc commit 86a4715

74 files changed

Lines changed: 3223 additions & 4663 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ node_modules
33
dist
44
tsc_out
55
.out
6-
/.changelog
6+
.changelog
77
.DS_Store
88
coverage
99
.cache
@@ -14,21 +14,20 @@ yarn-error.log
1414
lerna-debug.log
1515

1616
# IDEs and editors
17-
/.idea
17+
.idea
1818
.project
1919
.classpath
20-
.c9/
20+
.c9
2121
*.launch
22-
.settings/
22+
.settings
2323
*.sublime-workspace
24-
.history/*
24+
.history
25+
.vscode
2526

2627
# IDE - VSCode
27-
.vscode/*
28+
.vscode
29+
# For prettier
2830
!.vscode/settings.json
29-
!.vscode/tasks.json
30-
!.vscode/launch.json
31-
!.vscode/extensions.json
3231

3332
# Deploy directory
3433
.public

‎.vscode/launch.json‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎package.json‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
},
2424
"homepage": "https://github.com/patternfly/patternfly-react#readme",
2525
"devDependencies": {
26-
"@commitlint/cli": "^7.1.2",
2726
"@storybook/addon-actions": "^v3.4.11",
2827
"@storybook/addon-info": "^v3.4.11",
2928
"@storybook/addon-knobs": "^v3.4.11",
@@ -34,9 +33,9 @@
3433
"@storybook/addons": "^3.3.0",
3534
"@storybook/react": "^v3.4.11",
3635
"@storybook/storybook-deployer": "^2.1.0",
37-
"@types/jest": "^23.3.10",
38-
"@types/prop-types": "^15.5.6",
39-
"@types/react": "^16.7.13",
36+
"@types/enzyme": "3.9.0",
37+
"@types/jest": "^24.0.11",
38+
"@types/react": "~16.8.7",
4039
"babel-cli": "^6.26.0",
4140
"babel-core": "^6.26.0",
4241
"babel-eslint": "^9.0.0",
@@ -50,23 +49,20 @@
5049
"babel-preset-react": "^6.24.1",
5150
"change-case": "^3.0.2",
5251
"codecov": "^3.2.0",
53-
"commitizen": "^3.0.1",
54-
"commitlint-config-cz": "^0.10.1",
52+
"commitizen": "^3.0.7",
5553
"concurrently": "^3.5.1",
56-
"conventional-changelog-cli": "^2.0.5",
5754
"cross-env": "^5.1.4",
5855
"css-loader": "^0.28.11",
5956
"cypress": "^3.1.4",
6057
"cz-conventional-changelog": "^2.1.0",
61-
"enzyme": "^3.3.0",
62-
"enzyme-adapter-react-16.3": "^1.2.0",
63-
"enzyme-to-json": "^3.3.3",
58+
"enzyme": "3.9.0",
59+
"enzyme-adapter-react-16": "1.10.0",
60+
"enzyme-to-json": "3.3.5",
6461
"eslint": "^5.13.0",
6562
"eslint-import-resolver-webpack": "^0.9.0",
6663
"eslint-plugin-patternfly-react": "file:packages/eslint-plugin-patternfly-react",
6764
"fs-extra": "^6.0.1",
6865
"glob": "^7.1.2",
69-
"husky": "^0.14.3",
7066
"istanbul-api": "1.3.1",
7167
"istanbul-reports": "1.3.0",
7268
"jest": "^23.6.0",
@@ -79,8 +75,7 @@
7975
"plop": "^2.0.0",
8076
"prettier": "^1.16.1",
8177
"prettier-eslint": "^8.8.1",
82-
"prop-types": "^15.6.1",
83-
"react": "^16.3.0",
78+
"react": "~16.8.4",
8479
"react-dev-utils": "^5.0.0",
8580
"react-dom": "^16.3.0",
8681
"react-scripts": "2.1.3",
@@ -89,7 +84,7 @@
8984
"stylelint": "^9.10.1",
9085
"stylelint-config-standard": "^18.2.0",
9186
"surge": "^0.20.1",
92-
"ts-jest": "^23.10.5"
87+
"ts-jest": "23.10.5"
9388
},
9489
"optionalDependencies": {
9590
"sortabular": "^1.5.1",
@@ -103,13 +98,12 @@
10398
"scripts": {
10499
"bootstrap": "lerna bootstrap",
105100
"build": "yarn prebuild:pf4 && lerna run --parallel build",
101+
"commit": "git-cz",
106102
"prebuild:pf4": "lerna run --scope='@patternfly/react-styles' build",
107103
"build:docs": "yarn build && lerna run docbuild",
108104
"build:prdocs": "lerna run pr-build --stream",
109105
"build:storybook": "build-storybook -c storybook -o .out",
110106
"clean": "lerna run clean --parallel",
111-
"commit": "git-cz",
112-
"commitmsg": "commitlint -e",
113107
"generate": "yarn plop",
114108
"lint": "lerna run lint --parallel",
115109
"lint:fix": "lerna run lint:fix --parallel",
@@ -130,15 +124,14 @@
130124
"test:watch": "jest --watchAll",
131125
"uninstall": "find . -name node_modules -type d | xargs rm -rf"
132126
},
133-
"config": {
134-
"commitizen": {
135-
"path": "node_modules/cz-conventional-changelog"
136-
},
137-
"access": "public"
138-
},
139127
"workspaces": {
140128
"packages": [
141129
"packages/**"
142130
]
131+
},
132+
"config": {
133+
"commitizen": {
134+
"path": "node_modules/cz-conventional-changelog"
135+
}
143136
}
144137
}

‎packages/patternfly-3/patternfly-react-extensions/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"scripts": {
3232
"build": "yarn build:sass && yarn build:less && yarn build:babel",
33-
"build:babel": "concurrently \"yarn build:babel:cjs\" \"yarn build:babel:esm\"",
33+
"build:babel": "concurrently 'yarn build:babel:cjs' 'yarn build:babel:esm'",
3434
"build:babel:cjs": "cross-env BABEL_ENV=production:cjs babel src --out-dir dist/js",
3535
"build:babel:esm": "cross-env BABEL_ENV=production:esm babel src --out-dir dist/esm",
3636
"build:less": "shx mkdir -p dist/less && shx cp -r less/* dist/less",
@@ -57,4 +57,4 @@
5757
"react": "^16.3.2",
5858
"react-dom": "^16.3.2"
5959
}
60-
}
60+
}

0 commit comments

Comments
 (0)