From 9915ac62d023d56e21b9b311dce2681cde9fc2f9 Mon Sep 17 00:00:00 2001 From: SidKwok Date: Thu, 18 May 2017 21:30:40 +0800 Subject: [PATCH 1/2] replace PropTypes with `prop-types` library to remove warnings --- package.json | 1 + src/BootstrapTable.js | 3 +- src/SelectRowHeaderColumn.js | 3 +- src/TableBody.js | 3 +- src/TableColumn.js | 3 +- src/TableEditColumn.js | 3 +- src/TableFilter.js | 3 +- src/TableHeader.js | 3 +- src/TableHeaderColumn.js | 3 +- src/TableRow.js | 3 +- src/filters/Date.js | 3 +- src/filters/Number.js | 3 +- src/filters/Regex.js | 3 +- src/filters/Select.js | 3 +- src/filters/Text.js | 3 +- src/pagination/PageButton.js | 3 +- src/pagination/PaginationList.js | 3 +- src/pagination/SizePerPageDropDown.js | 3 +- src/toolbar/ButtonGroup.js | 3 +- src/toolbar/ClearSearchButton.js | 3 +- src/toolbar/DeleteButton.js | 3 +- src/toolbar/ExportCSVButton.js | 3 +- src/toolbar/InsertButton.js | 3 +- src/toolbar/InsertModal.js | 3 +- src/toolbar/InsertModalBody.js | 3 +- src/toolbar/InsertModalFooter.js | 3 +- src/toolbar/InsertModalHeader.js | 3 +- src/toolbar/SearchField.js | 3 +- src/toolbar/ShowSelectedOnlyButton.js | 3 +- src/toolbar/ToolBar.js | 3 +- yarn.lock | 147 +++++++------------------- 31 files changed, 99 insertions(+), 136 deletions(-) diff --git a/package.json b/package.json index 39db6cde6..3bba7c41f 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ }, "dependencies": { "classnames": "^2.1.2", + "prop-types": "^15.5.10", "react-modal": "^1.4.0", "react-s-alert": "^1.3.0" }, diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js index 3ab0aef03..a51faaa5b 100644 --- a/src/BootstrapTable.js +++ b/src/BootstrapTable.js @@ -1,6 +1,7 @@ /* eslint no-alert: 0 */ /* eslint max-len: 0 */ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classSet from 'classnames'; import Const from './Const'; import TableHeader from './TableHeader'; diff --git a/src/SelectRowHeaderColumn.js b/src/SelectRowHeaderColumn.js index 5801576c8..a62979dd8 100644 --- a/src/SelectRowHeaderColumn.js +++ b/src/SelectRowHeaderColumn.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; class SelectRowHeaderColumn extends Component { diff --git a/src/TableBody.js b/src/TableBody.js index ddc91dcac..586b8464c 100644 --- a/src/TableBody.js +++ b/src/TableBody.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Utils from './util'; import Const from './Const'; import TableRow from './TableRow'; diff --git a/src/TableColumn.js b/src/TableColumn.js index bfab88a85..cda059f29 100644 --- a/src/TableColumn.js +++ b/src/TableColumn.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; import Const from './Const'; diff --git a/src/TableEditColumn.js b/src/TableEditColumn.js index 2d6202fe3..72eff6c10 100644 --- a/src/TableEditColumn.js +++ b/src/TableEditColumn.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; import editor from './Editor'; import { notice } from './Notification.js'; diff --git a/src/TableFilter.js b/src/TableFilter.js index 53c765cf1..fc32f7c9a 100644 --- a/src/TableFilter.js +++ b/src/TableFilter.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Const from './Const'; import classSet from 'classnames'; diff --git a/src/TableHeader.js b/src/TableHeader.js index e2a4d7502..a50016c43 100644 --- a/src/TableHeader.js +++ b/src/TableHeader.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; import Const from './Const'; import classSet from 'classnames'; diff --git a/src/TableHeaderColumn.js b/src/TableHeaderColumn.js index 1ad14a479..1b92ed3fe 100644 --- a/src/TableHeaderColumn.js +++ b/src/TableHeaderColumn.js @@ -1,6 +1,7 @@ /* eslint default-case: 0 */ /* eslint guard-for-in: 0 */ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classSet from 'classnames'; import Const from './Const'; import Util from './util'; diff --git a/src/TableRow.js b/src/TableRow.js index 2f2c7c505..b190df6e0 100644 --- a/src/TableRow.js +++ b/src/TableRow.js @@ -1,6 +1,7 @@ /* eslint no-nested-ternary: 0 */ import classSet from 'classnames'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; class TableRow extends Component { diff --git a/src/filters/Date.js b/src/filters/Date.js index 44e8cdc66..f1e2d3816 100644 --- a/src/filters/Date.js +++ b/src/filters/Date.js @@ -1,6 +1,7 @@ /* eslint quotes: 0 */ /* eslint max-len: 0 */ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Const from '../Const'; const legalComparators = [ '=', '>', '>=', '<', '<=', '!=' ]; diff --git a/src/filters/Number.js b/src/filters/Number.js index 5e4969a28..295825ac3 100644 --- a/src/filters/Number.js +++ b/src/filters/Number.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classSet from 'classnames'; import Const from '../Const'; diff --git a/src/filters/Regex.js b/src/filters/Regex.js index 5f864f1ec..56b7e9c3e 100644 --- a/src/filters/Regex.js +++ b/src/filters/Regex.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Const from '../Const'; class RegexFilter extends Component { diff --git a/src/filters/Select.js b/src/filters/Select.js index 576c4f3b1..b8bb732a9 100644 --- a/src/filters/Select.js +++ b/src/filters/Select.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classSet from 'classnames'; import Const from '../Const'; diff --git a/src/filters/Text.js b/src/filters/Text.js index 80dd53358..ad7da2e7e 100644 --- a/src/filters/Text.js +++ b/src/filters/Text.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Const from '../Const'; class TextFilter extends Component { diff --git a/src/pagination/PageButton.js b/src/pagination/PageButton.js index f73eb1e42..061734b87 100644 --- a/src/pagination/PageButton.js +++ b/src/pagination/PageButton.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classSet from 'classnames'; class PageButton extends Component { diff --git a/src/pagination/PaginationList.js b/src/pagination/PaginationList.js index d7ce3c7ed..ee47677cf 100644 --- a/src/pagination/PaginationList.js +++ b/src/pagination/PaginationList.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classSet from 'classnames'; import PageButton from './PageButton.js'; import SizePerPageDropDown from './SizePerPageDropDown'; diff --git a/src/pagination/SizePerPageDropDown.js b/src/pagination/SizePerPageDropDown.js index 2bf2af6e0..9d47e97b4 100644 --- a/src/pagination/SizePerPageDropDown.js +++ b/src/pagination/SizePerPageDropDown.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; const sizePerPageDefaultClass = 'react-bs-table-sizePerPage-dropdown'; diff --git a/src/toolbar/ButtonGroup.js b/src/toolbar/ButtonGroup.js index 12336d1f0..d4e7cde0d 100644 --- a/src/toolbar/ButtonGroup.js +++ b/src/toolbar/ButtonGroup.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; class ButtonGroup extends Component { render() { diff --git a/src/toolbar/ClearSearchButton.js b/src/toolbar/ClearSearchButton.js index deadb09c6..989c3ebab 100644 --- a/src/toolbar/ClearSearchButton.js +++ b/src/toolbar/ClearSearchButton.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; const clearBtnDefaultClass = 'react-bs-table-search-clear-btn'; diff --git a/src/toolbar/DeleteButton.js b/src/toolbar/DeleteButton.js index 5d7115954..ce478f0cb 100644 --- a/src/toolbar/DeleteButton.js +++ b/src/toolbar/DeleteButton.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Const from '../Const'; const deleteBtnDefaultClass = 'react-bs-table-del-btn'; diff --git a/src/toolbar/ExportCSVButton.js b/src/toolbar/ExportCSVButton.js index 28bcd8ae3..6943ae867 100644 --- a/src/toolbar/ExportCSVButton.js +++ b/src/toolbar/ExportCSVButton.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Const from '../Const'; const exportCsvBtnDefaultClass = 'react-bs-table-csv-btn'; diff --git a/src/toolbar/InsertButton.js b/src/toolbar/InsertButton.js index 161f94a1e..b74abcd3f 100644 --- a/src/toolbar/InsertButton.js +++ b/src/toolbar/InsertButton.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Const from '../Const'; const insertBtnDefaultClass = 'react-bs-table-add-btn'; diff --git a/src/toolbar/InsertModal.js b/src/toolbar/InsertModal.js index 9ee77402c..b826612ff 100644 --- a/src/toolbar/InsertModal.js +++ b/src/toolbar/InsertModal.js @@ -1,6 +1,7 @@ /* eslint no-console: 0 */ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import InsertModalHeader from './InsertModalHeader'; import InsertModalFooter from './InsertModalFooter'; diff --git a/src/toolbar/InsertModalBody.js b/src/toolbar/InsertModalBody.js index 9cc406190..76b3399ae 100644 --- a/src/toolbar/InsertModalBody.js +++ b/src/toolbar/InsertModalBody.js @@ -1,5 +1,6 @@ /* eslint react/display-name: 0 */ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import editor from '../Editor'; diff --git a/src/toolbar/InsertModalFooter.js b/src/toolbar/InsertModalFooter.js index dadf1b766..8c98f4dc7 100644 --- a/src/toolbar/InsertModalFooter.js +++ b/src/toolbar/InsertModalFooter.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Const from '../Const'; class InsertModalFooter extends Component { diff --git a/src/toolbar/InsertModalHeader.js b/src/toolbar/InsertModalHeader.js index 7523f48c9..d0de93e9b 100644 --- a/src/toolbar/InsertModalHeader.js +++ b/src/toolbar/InsertModalHeader.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; class InsertModalHeader extends Component { diff --git a/src/toolbar/SearchField.js b/src/toolbar/SearchField.js index 8054633f6..37d25354b 100644 --- a/src/toolbar/SearchField.js +++ b/src/toolbar/SearchField.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; class SearchField extends Component { diff --git a/src/toolbar/ShowSelectedOnlyButton.js b/src/toolbar/ShowSelectedOnlyButton.js index e634bf204..51c3674fe 100644 --- a/src/toolbar/ShowSelectedOnlyButton.js +++ b/src/toolbar/ShowSelectedOnlyButton.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Const from '../Const'; const showSelectedOnlyBtnDefaultClass = 'react-bs-table-show-sel-only-btn'; diff --git a/src/toolbar/ToolBar.js b/src/toolbar/ToolBar.js index 9158868e0..2c355e7be 100644 --- a/src/toolbar/ToolBar.js +++ b/src/toolbar/ToolBar.js @@ -1,6 +1,7 @@ /* eslint no-console: 0 */ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Modal from 'react-modal'; // import classSet from 'classnames'; import Const from '../Const'; diff --git a/yarn.lock b/yarn.lock index 7ebdaed22..7e2aaee5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,17 +2,6 @@ # yarn lockfile v1 -"@allenfang/react-toastr@2.8.2": - version "2.8.2" - resolved "https://registry.yarnpkg.com/@allenfang/react-toastr/-/react-toastr-2.8.2.tgz#0bef6585189e0571dd6bdfc4ef98bc9f9c47da0c" - dependencies: - classnames "^2.2.5" - element-class "^0.2.2" - lodash "^4.16.1" - react "^0.14.0 || <15.4.0" - react-addons-update "^0.14.0 || <15.4.0" - react-dom "^0.14.0 || <15.4.0" - Base64@~0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/Base64/-/Base64-0.2.1.tgz#ba3a4230708e186705065e66babdd4c35cf60028" @@ -1090,14 +1079,7 @@ babel-register@^6.24.1: mkdirp "^0.5.1" source-map-support "^0.4.2" -babel-runtime@^6.11.6: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.18.0.tgz#0f4177ffd98492ef13b9f823e9994a02584c9078" - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.9.5" - -babel-runtime@^6.18.0, babel-runtime@^6.22.0: +babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" dependencies: @@ -1528,10 +1510,6 @@ caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000554: version "1.0.30000570" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000570.tgz#21843913855f4873974850ee8ef9e628f53bc8de" -caseless@~0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" - caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -1725,12 +1703,6 @@ commander@2.8.x, commander@^2.5.0: dependencies: graceful-readlink ">= 1.0.0" -commander@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - dependencies: - graceful-readlink ">= 1.0.0" - commondir@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-0.0.1.tgz#89f00fdcd51b519c578733fec563e6a6da7f5be2" @@ -2253,7 +2225,7 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -element-class@^0.2.0, element-class@^0.2.2: +element-class@^0.2.0: version "0.2.2" resolved "https://registry.yarnpkg.com/element-class/-/element-class-0.2.2.tgz#9d3bbd0767f9013ef8e1c8ebe722c1402a60050e" @@ -3212,15 +3184,6 @@ har-schema@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" -har-validator@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" - dependencies: - chalk "^1.1.1" - commander "^2.9.0" - is-my-json-valid "^2.12.4" - pinkie-promise "^2.0.0" - har-validator@~4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" @@ -3614,7 +3577,7 @@ is-integer@^1.0.4: dependencies: is-finite "^1.0.0" -is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4: +is-my-json-valid@^2.10.0: version "2.15.0" resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz#936edda3ca3c211fd98f3b2d3e08da43f7b2915b" dependencies: @@ -4660,7 +4623,7 @@ lodash@^3.10.0, lodash@^3.3.1, lodash@^3.9.3: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.14.0, lodash@^4.16.1, lodash@^4.16.2, lodash@^4.2.0, lodash@^4.6.1: +lodash@^4.0.0, lodash@^4.14.0, lodash@^4.16.2, lodash@^4.2.0, lodash@^4.6.1: version "4.16.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.4.tgz#01ce306b9bad1319f2a5528674f88297aeb70127" @@ -4678,6 +4641,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0: dependencies: js-tokens "^2.0.0" +loose-envify@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" + dependencies: + js-tokens "^3.0.0" + loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" @@ -4808,15 +4777,15 @@ minimalistic-assert@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" -"minimatch@2 || 3", minimatch@^2.0.1, minimatch@^2.0.3: - version "2.0.10" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" dependencies: brace-expansion "^1.0.0" -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" +minimatch@^2.0.1, minimatch@^2.0.3: + version "2.0.10" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" dependencies: brace-expansion "^1.0.0" @@ -4988,10 +4957,6 @@ node-pre-gyp@^0.6.29: tar "~2.2.1" tar-pack "~3.3.0" -node-uuid@~1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.7.tgz#6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f" - nomnom@~1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971" @@ -5624,6 +5589,13 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +prop-types@^15.5.10: + version "15.5.10" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" + dependencies: + fbjs "^0.8.9" + loose-envify "^1.3.1" + prop-types@^15.5.4: version "15.5.8" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394" @@ -5667,10 +5639,6 @@ qs@6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b" -qs@~6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442" - qs@~6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" @@ -5729,7 +5697,7 @@ rc@~1.1.6: minimist "^1.2.0" strip-json-comments "~1.0.4" -react, "react@^0.14.0 || <15.4.0": +react: version "15.3.2" resolved "https://registry.yarnpkg.com/react/-/react-15.3.2.tgz#a7bccd2fee8af126b0317e222c28d1d54528d09e" dependencies: @@ -5737,10 +5705,6 @@ react, "react@^0.14.0 || <15.4.0": loose-envify "^1.1.0" object-assign "^4.1.0" -"react-addons-update@^0.14.0 || <15.4.0": - version "15.3.2" - resolved "https://registry.yarnpkg.com/react-addons-update/-/react-addons-update-15.3.2.tgz#b6385c4db1e5df371825e0615b04360ed94430fe" - react-bootstrap: version "0.30.6" resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-0.30.6.tgz#288662a245f9dbb79f7740ee595e4ec931d6a4a9" @@ -5759,7 +5723,7 @@ react-deep-force-update@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz#4f7f6c12c3e7de42f345992a3c518236fa1ecad3" -react-dom, "react-dom@^0.14.0 || <15.4.0": +react-dom: version "15.3.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.3.2.tgz#c46b0aa5380d7b838e7a59c4a7beff2ed315531f" @@ -5813,6 +5777,12 @@ react-router: loose-envify "^1.2.0" warning "^3.0.0" +react-s-alert@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/react-s-alert/-/react-s-alert-1.3.0.tgz#d81224a474f15e89c35c0ea6c2a73f232a767128" + dependencies: + babel-runtime "^6.23.0" + read-only-stream@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-1.1.1.tgz#5da77c799ed1388d3ef88a18471bb5924f8a0ba1" @@ -5956,10 +5926,6 @@ regenerator-runtime@^0.10.0: version "0.10.5" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" -regenerator-runtime@^0.9.5: - version "0.9.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz#403d6d40a4bdff9c330dd9392dcbb2d9a8bba1fc" - regenerator-transform@0.9.11: version "0.9.11" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283" @@ -6046,32 +6012,7 @@ replace-ext@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" -request@^2.75.0: - version "2.76.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.76.0.tgz#be44505afef70360a0436955106be3945d95560e" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.11.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~2.0.6" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - node-uuid "~1.4.7" - oauth-sign "~0.8.1" - qs "~6.3.0" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "~0.4.1" - -request@^2.79.0: +request@^2.75.0, request@^2.79.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -6173,15 +6114,15 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@~2.5.1, rimraf@~2.5.4: - version "2.5.4" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" +rimraf@2, rimraf@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: glob "^7.0.5" -rimraf@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" +rimraf@^2.2.8, rimraf@~2.5.1, rimraf@~2.5.4: + version "2.5.4" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" dependencies: glob "^7.0.5" @@ -6831,10 +6772,6 @@ to-single-quotes@^1.0.3: dependencies: get-stdin "^3.0.0" -toastr@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/toastr/-/toastr-2.1.2.tgz#fd69066ae7578a5b3357725fc9c7c335e9b681df" - tough-cookie@^2.3.2, tough-cookie@~2.3.0: version "2.3.2" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a" @@ -6875,10 +6812,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tunnel-agent@~0.4.1: - version "0.4.3" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" - tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.3" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.3.tgz#3da382f670f25ded78d7b3d1792119bca0b7132d" @@ -7248,13 +7181,13 @@ which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" -which@^1.1.1, which@^1.2.10: +which@^1.1.1: version "1.2.11" resolved "https://registry.yarnpkg.com/which/-/which-1.2.11.tgz#c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b" dependencies: isexe "^1.1.1" -which@^1.2.12: +which@^1.2.10, which@^1.2.12: version "1.2.14" resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" dependencies: From f5ecf94fe67cddbc11fb680b979b06b83fe2840a Mon Sep 17 00:00:00 2001 From: SidKwok Date: Sun, 21 May 2017 21:25:15 +0800 Subject: [PATCH 2/2] replace React.PropTypes with `prop-types` --- examples/js/column-filter/custom-filter.js | 7 ++++--- examples/js/components/App.js | 3 ++- src/BootstrapTable.js | 12 ++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/examples/js/column-filter/custom-filter.js b/examples/js/column-filter/custom-filter.js index 88e0e2517..b944f265e 100644 --- a/examples/js/column-filter/custom-filter.js +++ b/examples/js/column-filter/custom-filter.js @@ -1,6 +1,7 @@ /* eslint max-len: 0 */ /* eslint no-unused-vars: 0 */ import React from 'react'; +import PropTypes from 'prop-types'; import { BootstrapTable, TableHeaderColumn } from 'react-bootstrap-table'; const products = []; @@ -60,9 +61,9 @@ class CheckboxFilter extends React.Component { } CheckboxFilter.propTypes = { - filterHandler: React.PropTypes.func.isRequired, - textOK: React.PropTypes.string, - textNOK: React.PropTypes.string + filterHandler: PropTypes.func.isRequired, + textOK: PropTypes.string, + textNOK: PropTypes.string }; CheckboxFilter.defaultProps = { diff --git a/examples/js/components/App.js b/examples/js/components/App.js index 70799afe7..80946afb3 100644 --- a/examples/js/components/App.js +++ b/examples/js/components/App.js @@ -1,5 +1,6 @@ /* eslint max-len: 0 */ import React from 'react'; +import PropTypes from 'prop-types'; import 'react-s-alert/dist/s-alert-default.css'; import 'react-s-alert/dist/s-alert-css-effects/scale.css'; import '../../../css/react-bootstrap-table.css'; @@ -12,7 +13,7 @@ import { class App extends React.Component { static propTypes = { - children: React.PropTypes.node + children: PropTypes.node }; static defaultProps = {}; diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js index a51faaa5b..81924126f 100644 --- a/src/BootstrapTable.js +++ b/src/BootstrapTable.js @@ -1412,13 +1412,13 @@ BootstrapTable.propTypes = { onSortChange: PropTypes.func, onPageChange: PropTypes.func, onSizePerPageList: PropTypes.func, - onFilterChange: React.PropTypes.func, - onSearchChange: React.PropTypes.func, - onAddRow: React.PropTypes.func, - onExportToCSV: React.PropTypes.func, - onCellEdit: React.PropTypes.func, + onFilterChange: PropTypes.func, + onSearchChange: PropTypes.func, + onAddRow: PropTypes.func, + onExportToCSV: PropTypes.func, + onCellEdit: PropTypes.func, noDataText: PropTypes.oneOfType([ PropTypes.string, PropTypes.object ]), - withoutNoDataText: React.PropTypes.bool, + withoutNoDataText: PropTypes.bool, handleConfirmDeleteRow: PropTypes.func, prePage: PropTypes.string, nextPage: PropTypes.string,