From d380c231a29a03ac474e259bf32c9c0d0aca391c Mon Sep 17 00:00:00 2001 From: Mike Cooper Date: Wed, 6 Nov 2019 16:31:31 -0800 Subject: [PATCH] Revert "Merge #1089 #1091" This reverts commit 803c221eac6ec7911432fd521f693eb2e6f30570, reversing changes made to 3eb31dfb4f619a17b6edec8c428130017f426c88. --- package.json | 4 +- yarn.lock | 102 ++++++++++++++++++++++++++------------------------- 2 files changed, 55 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 647e922..9ba4b08 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@babel/plugin-proposal-decorators": "7.6.0", "@babel/polyfill": "7.6.0", "@babel/runtime": "7.6.3", - "antd": "3.24.3", + "antd": "3.23.5", "auth0-js": "9.11.3", "autobind-decorator": "2.4.0", "autoprefixer": "9.7.0", @@ -70,7 +70,7 @@ "webpack-merge": "4.2.2" }, "devDependencies": { - "@testing-library/react": "9.3.1", + "@testing-library/react": "9.3.0", "babel-eslint": "10.0.3", "babel-jest": "24.9.0", "dotenv": "8.2.0", diff --git a/yarn.lock b/yarn.lock index 29c6b97..381a5ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1044,10 +1044,10 @@ pretty-format "^24.9.0" wait-for-expect "^3.0.0" -"@testing-library/react@9.3.1": - version "9.3.1" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-9.3.1.tgz#96573fb9942e1ca0ed1ec9984ea7b12b66945963" - integrity sha512-BXlYrbxTkifNVb7rIC8EHqYXgG/rBeULqG3V0wbEAuSaZ7n5ERX9Bcp0i+9EecrNpLNPwR0cIxdKNp6qVTZS9A== +"@testing-library/react@9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-9.3.0.tgz#1dabf46d1ea018a1c89acecc0e7b86859b34c0f8" + integrity sha512-FTPCwmLo0tLtP50Au2uGz4/N1BcJTnBx4StDVHZ47zPMEj1/+J2rk/RTj8SLoHRKWCtcmhN4wRmudOXQNP29/w== dependencies: "@babel/runtime" "^7.6.0" "@testing-library/dom" "^6.3.0" @@ -1520,10 +1520,10 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -antd@3.24.3: - version "3.24.3" - resolved "https://registry.yarnpkg.com/antd/-/antd-3.24.3.tgz#103e31a1a287166566db9ea16450588314367265" - integrity sha512-yr4kV8lUdYNCOj5+TjIufLGYF0naTfNiAJV0JWqh9RzRGapGVES928K/2gyF7Ow3da6ZlsgxtO1P25exbvDlSw== +antd@3.23.5: + version "3.23.5" + resolved "https://registry.yarnpkg.com/antd/-/antd-3.23.5.tgz#ee87cd742c9ac99c95e728aa948615108629af59" + integrity sha512-D4N10iocjLxpLBQB+9hNcTeWKsh+eM3uYcC/I2JQcmFcSPRyO9FJvORaN7LK8Vxo7McGhpxPObdygpXSaIlKQw== dependencies: "@ant-design/create-react-context" "^0.2.4" "@ant-design/icons" "~2.1.1" @@ -1547,30 +1547,30 @@ antd@3.24.3: rc-checkbox "~2.1.6" rc-collapse "~1.11.3" rc-dialog "~7.5.2" - rc-drawer "~3.0.0" + rc-drawer "~2.0.1" rc-dropdown "~2.4.1" rc-editor-mention "^1.1.13" rc-form "^2.4.5" rc-input-number "~4.5.0" rc-mentions "~0.4.0" - rc-menu "~7.5.1" + rc-menu "~7.4.23" rc-notification "~3.3.1" rc-pagination "~1.20.5" rc-progress "~2.5.0" rc-rate "~2.5.0" rc-resize-observer "^0.1.0" rc-select "~9.2.0" - rc-slider "~8.7.1" + rc-slider "~8.6.11" rc-steps "~3.5.0" rc-switch "~1.9.0" - rc-table "~6.9.4" + rc-table "~6.7.0" rc-tabs "~9.6.4" rc-time-picker "~3.7.1" rc-tooltip "~3.7.3" rc-tree "~2.1.0" rc-tree-select "~2.9.1" rc-trigger "^2.6.2" - rc-upload "~2.8.0" + rc-upload "~2.7.0" rc-util "^4.10.0" react-lazy-load "^3.0.13" react-lifecycles-compat "^3.0.4" @@ -8898,14 +8898,14 @@ rc-dialog@~7.5.2: rc-animate "2.x" rc-util "^4.8.1" -rc-drawer@~3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-3.0.2.tgz#1c42b2b7790040344f8f05f1d132b1ef0e97b783" - integrity sha512-oPScGXB/8/ov9gEFLxPH8RBv/9jLTZboZtyF/GgrrnCAvbFwUxXdELH6n6XIowmuDKKvTGIMgZdnao0T46Yv3A== +rc-drawer@~2.0.1: + version "2.0.9" + resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-2.0.9.tgz#d1d07b74416b50d22082b5886ec061be2b2b15fc" + integrity sha512-7qwEND3TLvJeyuUvZfMDkL2pHsR/XHX5HvoaBlIH9mTcFWBmMNrvYGDuGHgGsdNKZZgIBwlkvl5vhckydTUc9Q== dependencies: - babel-runtime "^6.26.0" - classnames "^2.2.6" - rc-util "^4.11.2" + babel-runtime "6.x" + classnames "^2.2.5" + rc-util "^4.7.0" react-lifecycles-compat "^3.0.4" rc-dropdown@~2.4.1: @@ -8991,7 +8991,7 @@ rc-mentions@~0.4.0: rc-util "^4.6.0" react-lifecycles-compat "^3.0.4" -rc-menu@^7.3.0, rc-menu@^7.4.22, rc-menu@~7.5.1: +rc-menu@^7.3.0, rc-menu@^7.4.22: version "7.5.3" resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-7.5.3.tgz#0bdb71ef1f0b4608a25eb9848fa9f673f5353579" integrity sha512-H/jUyGbJxZI/iuVdC6Iu9KHfz7tucoqK0Vn8ahDnv+ppc1PnKb4SkBbXn5LrmUyaj7thCBiaktBxVnUXSmNE2g== @@ -9006,6 +9006,20 @@ rc-menu@^7.3.0, rc-menu@^7.4.22, rc-menu@~7.5.1: resize-observer-polyfill "^1.5.0" shallowequal "^1.1.0" +rc-menu@~7.4.23: + version "7.4.32" + resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-7.4.32.tgz#71409216daaa9f43d8acc4530628879740d63708" + integrity sha512-9/ySqniMdvhUhfiUFmqK3hLffYIdeR2nrDDNvXksTCc2ZYd1JmOWF16yO7iYyDPLZM33NU3Qw6EPZd21+FxJsQ== + dependencies: + classnames "2.x" + dom-scroll-into-view "1.x" + mini-store "^2.0.0" + mutationobserver-shim "^0.3.2" + rc-animate "2.x" + rc-trigger "^2.3.0" + rc-util "^4.13.0" + resize-observer-polyfill "^1.5.0" + rc-notification@~3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-3.3.1.tgz#0baa3e70f8d40ab015ce8fa78c260c490fc7beb4" @@ -9072,18 +9086,17 @@ rc-select@~9.2.0: react-lifecycles-compat "^3.0.2" warning "^4.0.2" -rc-slider@~8.7.1: - version "8.7.1" - resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.7.1.tgz#9ed07362dc93489a38e654b21b8122ad70fd3c42" - integrity sha512-WMT5mRFUEcrLWwTxsyS8jYmlaMsTVCZIGENLikHsNv+tE8ThU2lCoPfi/xFNUfJFNFSBFP3MwPez9ZsJmNp13g== +rc-slider@~8.6.11: + version "8.6.13" + resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.6.13.tgz#88a8150c2dda6709f3f119135de11fba80af765b" + integrity sha512-fCUe8pPn8n9pq1ARX44nN2nzJoATtna4x/PdskUrxIvZXN8ja7HuceN/hq6kokZjo3FBD2B1yMZvZh6oi68l6Q== dependencies: babel-runtime "6.x" classnames "^2.2.5" prop-types "^15.5.4" rc-tooltip "^3.7.0" rc-util "^4.0.4" - react-lifecycles-compat "^3.0.4" - shallowequal "^1.1.0" + shallowequal "^1.0.1" warning "^4.0.3" rc-steps@~3.5.0: @@ -9105,19 +9118,21 @@ rc-switch@~1.9.0: prop-types "^15.5.6" react-lifecycles-compat "^3.0.4" -rc-table@~6.9.4: - version "6.9.5" - resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-6.9.5.tgz#b7394c3780d4ad2398d08d2059aba454f195273f" - integrity sha512-STL6387A/izVh6r9F1WDiIIZ0QeubCdTgIlzMeGTSl/bXhB0VqjAZEikvoijPoauTjJIkIzVuQEIDjOhAWbpkQ== +rc-table@~6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-6.7.0.tgz#8aca002f84a43a2d51a4fcda0f7a51694154286d" + integrity sha512-zzu7UtEHLTzZibB1EOoeKQejH21suoxRQx3evlGGLwz5NUh2HDUHobSr12z5Kd8EPr1+y/LPzXJdX1ctFPC+hA== dependencies: + babel-runtime "6.x" classnames "^2.2.5" component-classes "^1.2.6" lodash "^4.17.5" mini-store "^2.0.0" prop-types "^15.5.8" - rc-util "^4.13.0" + rc-util "^4.0.4" react-lifecycles-compat "^3.0.2" shallowequal "^1.0.2" + warning "^3.0.0" rc-tabs@~9.6.4: version "9.6.7" @@ -9226,17 +9241,17 @@ rc-trigger@^3.0.0-rc.2: rc-animate "^3.0.0-rc.1" rc-util "^4.4.0" -rc-upload@~2.8.0: - version "2.8.1" - resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.8.1.tgz#8218eb8c4ed9cfb0340311c2c60525fc31060cb6" - integrity sha512-FmKZgWsgOyKeZuperDjHrj8Qx5fdQqYuNpmDR50AP7Za87o8QsRvCbIKG2pgQ9MpNkUbiQOV15FqlQBl2WisfQ== +rc-upload@~2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.7.0.tgz#f279b758655eb5f99ebf82a5a2648d80d88e0ff4" + integrity sha512-Oh9EJB4xE8MQUZ2D0OUST3UMIBjHjnO2IjPNW/cbPredxZz+lzbLPCZxcxRwUwu1gt0LA968UWXAgT1EvZdFfA== dependencies: babel-runtime "6.x" classnames "^2.2.5" prop-types "^15.5.7" warning "4.x" -rc-util@^4.0.4, rc-util@^4.1.1, rc-util@^4.10.0, rc-util@^4.11.1, rc-util@^4.13.0, rc-util@^4.3.0, rc-util@^4.4.0, rc-util@^4.5.0, rc-util@^4.5.1, rc-util@^4.6.0, rc-util@^4.8.0, rc-util@^4.8.1: +rc-util@^4.0.4, rc-util@^4.1.1, rc-util@^4.10.0, rc-util@^4.11.1, rc-util@^4.13.0, rc-util@^4.3.0, rc-util@^4.4.0, rc-util@^4.5.0, rc-util@^4.5.1, rc-util@^4.6.0, rc-util@^4.7.0, rc-util@^4.8.0, rc-util@^4.8.1: version "4.13.0" resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.13.0.tgz#75682e50a934e7d32ada7ee48fc9f5b20fc0143f" integrity sha512-rjfPy+afc2n40APHp6GYScXfgwHuUnYLz/4SCEWRaF8CHXKR8xw598LtPA36J3fEXENuMm6liO/CoKBoSrYCDw== @@ -9247,17 +9262,6 @@ rc-util@^4.0.4, rc-util@^4.1.1, rc-util@^4.10.0, rc-util@^4.11.1, rc-util@^4.13. react-lifecycles-compat "^3.0.4" shallowequal "^0.2.2" -rc-util@^4.11.2: - version "4.14.4" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.14.4.tgz#e7e009559e93bba022c49b0d0aec62665d6a0e7f" - integrity sha512-GQgEn6ywJYZq1NEoZ6NZzeaE2U6mT6DhdqrtRV5IBNM3yTZZW8HRjIiMOpXOhTEUj10bnHnKWKZpC36RoNmS9Q== - dependencies: - add-dom-event-listener "^1.1.0" - babel-runtime "6.x" - prop-types "^15.5.10" - react-lifecycles-compat "^3.0.4" - shallowequal "^0.2.2" - rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -10172,7 +10176,7 @@ shallowequal@^0.2.2: dependencies: lodash.keys "^3.1.2" -shallowequal@^1.0.2, shallowequal@^1.1.0: +shallowequal@^1.0.1, shallowequal@^1.0.2, shallowequal@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==