Skip to content

Commit

Permalink
Update React to 16.3 (elastic#18768)
Browse files Browse the repository at this point in the history
* Update React to 16.3

* Switch off specific eslint rules

* Update enzyme snapshots

* Incorporate PR feedback
  • Loading branch information
timroes committed May 14, 2018
1 parent ef12447 commit 8721a06
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ module.exports = {

settings: {
'import/resolver': 'eslint-import-resolver-node',
react: {
version: '16.3',
},
},

overrides: [
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@
"proxy-from-env": "1.0.0",
"querystring-browser": "1.0.4",
"raw-loader": "0.5.1",
"react": "^16.2.0",
"react": "^16.3.0",
"react-addons-shallow-compare": "15.6.2",
"react-anything-sortable": "^1.7.4",
"react-color": "^2.13.8",
"react-dom": "^16.2.0",
"react-dom": "^16.3.0",
"react-grid-layout": "^0.16.2",
"react-input-range": "^1.3.0",
"react-markdown": "^3.1.4",
Expand Down
2 changes: 0 additions & 2 deletions packages/eslint-config-kibana/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@ module.exports = {
'react/jsx-first-prop-new-line': ['error', 'multiline-multiprop'],
'react/jsx-equals-spacing': ['error', 'never'],
'react/jsx-indent': ['error', 2],
'react/no-did-mount-set-state': 'error',
'react/no-did-update-set-state': 'error',
'react/no-will-update-set-state': 'error',
'react/no-is-mounted': 'error',
'react/no-multi-comp': ['error', { ignoreStateless: true }],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ exports[`renders KuiListingTable 1`] = `
class="kuiToolBarSearchBox__input"
placeholder="Search..."
type="text"
value=""
/>
</div>
</div>
Expand All @@ -41,7 +42,6 @@ exports[`renders KuiListingTable 1`] = `
aria-label="Select all rows"
class="kuiCheckBox"
type="checkbox"
value="on"
/>
</div>
</th>
Expand Down Expand Up @@ -81,7 +81,6 @@ exports[`renders KuiListingTable 1`] = `
aria-label="Select row"
class="kuiCheckBox"
type="checkbox"
value="on"
/>
</div>
</td>
Expand Down Expand Up @@ -117,7 +116,6 @@ exports[`renders KuiListingTable 1`] = `
aria-label="Select row"
class="kuiCheckBox"
type="checkbox"
value="on"
/>
</div>
</td>
Expand Down Expand Up @@ -153,7 +151,6 @@ exports[`renders KuiListingTable 1`] = `
aria-label="Select row"
class="kuiCheckBox"
type="checkbox"
value="on"
/>
</div>
</td>
Expand Down
4 changes: 2 additions & 2 deletions x-pack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@
"pngjs": "3.3.1",
"prop-types": "^15.6.0",
"puid": "1.0.5",
"react": "^16.2.0",
"react": "^16.3.0",
"react-clipboard.js": "^1.1.2",
"react-dom": "^16.2.0",
"react-dom": "^16.3.0",
"react-markdown-renderer": "^1.4.0",
"react-portal": "^3.2.0",
"react-redux": "^5.0.5",
Expand Down
20 changes: 19 additions & 1 deletion x-pack/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6047,7 +6047,7 @@ react-datepicker@v1.4.1:
react-onclickoutside "^6.7.1"
react-popper "^0.9.1"

react-dom@^16.0.0, react-dom@^16.2.0:
react-dom@^16.0.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
dependencies:
Expand All @@ -6056,6 +6056,15 @@ react-dom@^16.0.0, react-dom@^16.2.0:
object-assign "^4.1.1"
prop-types "^15.6.0"

react-dom@^16.3.0:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"

react-input-autosize@^2.1.2, react-input-autosize@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8"
Expand Down Expand Up @@ -6213,6 +6222,15 @@ react@>=0.13.3, react@^16.2.0:
object-assign "^4.1.1"
prop-types "^15.6.0"

react@^16.3.0:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"

reactcss@^1.2.0:
version "1.2.3"
resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
Expand Down
18 changes: 18 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10230,6 +10230,15 @@ react-dom@^16.0.0, react-dom@^16.2.0:
object-assign "^4.1.1"
prop-types "^15.6.0"

react-dom@^16.3.0:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"

react-draggable@3.x, "react-draggable@^2.2.6 || ^3.0.3":
version "3.0.5"
resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.0.5.tgz#c031e0ed4313531f9409d6cd84c8ebcec0ddfe2d"
Expand Down Expand Up @@ -10441,6 +10450,15 @@ react@>=0.13.3, react@^16.2.0:
object-assign "^4.1.1"
prop-types "^15.6.0"

react@^16.3.0:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"

reactcss@1.2.3, reactcss@^1.2.0:
version "1.2.3"
resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
Expand Down

0 comments on commit 8721a06

Please sign in to comment.