From 498f22732d227f01fc26161ac02809bee51dbf3b Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Wed, 3 Aug 2022 13:40:02 +1200 Subject: [PATCH 01/11] Update antd --- antd/yarn.lock | 634 +++++++++++++++++++++++++------------------------ build.sbt | 4 +- 2 files changed, 321 insertions(+), 317 deletions(-) diff --git a/antd/yarn.lock b/antd/yarn.lock index 255224f..7d0e5e3 100644 --- a/antd/yarn.lock +++ b/antd/yarn.lock @@ -2,47 +2,41 @@ # yarn lockfile v1 -"@ant-design/colors@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-5.0.1.tgz#09670f2f44a7473d7bc01be901c48ec10f12c7a4" - integrity sha512-x1TUaRILaqy3zgFNo+kIqOa3eTYPt81H1/3E4dCjDP4Qvk/xaPEizLDFdRUcIx0cWwyu2LklwfyLHWpbYK8v6A== +"@ant-design/colors@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-6.0.0.tgz#9b9366257cffcc47db42b9d0203bb592c13c0298" + integrity sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ== dependencies: - "@ctrl/tinycolor" "^3.3.1" - -"@ant-design/css-animation@^1.7.2": - version "1.7.2" - resolved "https://registry.yarnpkg.com/@ant-design/css-animation/-/css-animation-1.7.2.tgz#4ee5d2ec0fb7cc0a78b44e1c82628bd4621ac7e3" - integrity sha512-bvVOe7A+r7lws58B7r+fgnQDK90cV45AXuvGx6i5CCSX1W/M3AJnHsNggDANBxEtWdNdFWcDd5LorB+RdSIlBw== + "@ctrl/tinycolor" "^3.4.0" -"@ant-design/icons-svg@^4.0.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.1.0.tgz#480b025f4b20ef7fe8f47d4a4846e4fee84ea06c" - integrity sha512-Fi03PfuUqRs76aI3UWYpP864lkrfPo0hluwGqh7NJdLhvH4iRDc3jbJqZIvRDLHKbXrvAfPPV3+zjUccfFvWOQ== +"@ant-design/icons-svg@^4.2.1": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz#8630da8eb4471a4aabdaed7d1ff6a97dcb2cf05a" + integrity sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw== -"@ant-design/icons@^4.2.2", "@ant-design/icons@^4.3.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.3.0.tgz#420e0cd527486c0fe57f81310d681950fc4cfacf" - integrity sha512-UoIbw4oz/L/msbkgqs2nls2KP7XNKScOxVR54wRrWwnXOzJaGNwwSdYjHQz+5ETf8C53YPpzMOnRX99LFCdeIQ== +"@ant-design/icons@^4.7.0": + version "4.7.0" + resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.7.0.tgz#8c3cbe0a556ba92af5dc7d1e70c0b25b5179af0f" + integrity sha512-aoB4Z7JA431rt6d4u+8xcNPPCrdufSRMUOpxa1ab6mz1JCQZOEVolj2WVs/tDFmN62zzK30mNelEsprLYsSF3g== dependencies: - "@ant-design/colors" "^5.0.0" - "@ant-design/icons-svg" "^4.0.0" + "@ant-design/colors" "^6.0.0" + "@ant-design/icons-svg" "^4.2.1" "@babel/runtime" "^7.11.2" classnames "^2.2.6" - insert-css "^2.0.0" - rc-util "^5.0.1" + rc-util "^5.9.4" -"@ant-design/react-slick@~0.27.0": - version "0.27.0" - resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.27.0.tgz#c5d4bfd879885b74024ffbce42cccb5f7bff41e9" - integrity sha512-dq/p/1oKgew99cNrhT6/BA4v7c7nAhPlS6IcVGVTMsp175bYxbHBT1GfY5vxZyz97YaTnzJ8s2Wql4AOnFQ+9g== +"@ant-design/react-slick@~0.29.1": + version "0.29.2" + resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.29.2.tgz#53e6a7920ea3562eebb304c15a7fc2d7e619d29c" + integrity sha512-kgjtKmkGHa19FW21lHnAfyyH9AAoh35pBdcJ53rHmQ3O+cfFHGHnUbj/HFrRNJ5vIts09FKJVAD8RpaC+RaWfA== dependencies: "@babel/runtime" "^7.10.4" classnames "^2.2.5" json2mq "^0.2.0" - lodash "^4.17.15" - resize-observer-polyfill "^1.5.0" + lodash "^4.17.21" + resize-observer-polyfill "^1.5.1" -"@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.8.4": +"@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz#a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99" integrity sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw== @@ -56,10 +50,17 @@ dependencies: regenerator-runtime "^0.13.4" -"@ctrl/tinycolor@^3.3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.3.1.tgz#fa0efcf813daa43f8a6aef3ddaa80f7e66f1278e" - integrity sha512-jUJrjU62MUgHDSu5JfONfgRM2V7GfN5KknsygfIbxwRZXGeayIzxk4O9GiYgEAr9DG5HJThTF5+a5x3wtrOKzQ== +"@babel/runtime@^7.12.5", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a" + integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw== + dependencies: + regenerator-runtime "^0.13.4" + +"@ctrl/tinycolor@^3.4.0": + version "3.4.1" + resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz#75b4c27948c81e88ccd3a8902047bcd797f38d32" + integrity sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw== "@types/glob@^7.1.1": version "7.1.3" @@ -333,53 +334,55 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -antd@4.9.4: - version "4.9.4" - resolved "https://registry.yarnpkg.com/antd/-/antd-4.9.4.tgz#129092bc4a67c774145cb2450e4046d27a1acbb1" - integrity sha512-kieGi1Isb/ddnn9E/AJVFCUgSZIqDv6HtFg7r5WWI0s6zf+nfCOtpes0oX8TdHO6mE/dL39pJG52aHNe8MwkJg== +antd@*: + version "4.22.3" + resolved "https://registry.yarnpkg.com/antd/-/antd-4.22.3.tgz#c6d4ced17e9c21b55c6234595d962c5f9d6768db" + integrity sha512-Nay1tO+G5Z9szmshK9TinOWclJnxOtSe7cr15EX64NGkZZyRoHX2xXOFQoYtBt4qfVfFvLf97m9on7fwgy1Svg== dependencies: - "@ant-design/colors" "^5.0.0" - "@ant-design/icons" "^4.3.0" - "@ant-design/react-slick" "~0.27.0" - "@babel/runtime" "^7.11.2" - array-tree-filter "^2.1.0" + "@ant-design/colors" "^6.0.0" + "@ant-design/icons" "^4.7.0" + "@ant-design/react-slick" "~0.29.1" + "@babel/runtime" "^7.18.3" + "@ctrl/tinycolor" "^3.4.0" classnames "^2.2.6" copy-to-clipboard "^3.2.0" - lodash "^4.17.20" - moment "^2.25.3" - omit.js "^2.0.2" - rc-cascader "~1.4.0" + lodash "^4.17.21" + memoize-one "^6.0.0" + moment "^2.29.2" + rc-cascader "~3.6.0" rc-checkbox "~2.3.0" - rc-collapse "~3.1.0" - rc-dialog "~8.4.0" - rc-drawer "~4.1.0" - rc-dropdown "~3.2.0" - rc-field-form "~1.17.0" - rc-image "~4.2.0" - rc-input-number "~6.1.0" - rc-mentions "~1.5.0" - rc-menu "~8.10.0" - rc-motion "^2.4.0" - rc-notification "~4.5.2" - rc-pagination "~3.1.2" - rc-picker "~2.4.1" - rc-progress "~3.1.0" + rc-collapse "~3.3.0" + rc-dialog "~8.9.0" + rc-drawer "~5.1.0-alpha.1" + rc-dropdown "~4.0.0" + rc-field-form "~1.27.0" + rc-image "~5.7.0" + rc-input "~0.0.1-alpha.5" + rc-input-number "~7.3.5" + rc-mentions "~1.9.0" + rc-menu "~9.6.0" + rc-motion "^2.6.1" + rc-notification "~4.6.0" + rc-pagination "~3.1.17" + rc-picker "~2.6.10" + rc-progress "~3.3.2" rc-rate "~2.9.0" - rc-resize-observer "^0.2.3" - rc-select "~11.5.3" - rc-slider "~9.6.1" + rc-resize-observer "^1.2.0" + rc-segmented "~2.1.0" + rc-select "~14.1.1" + rc-slider "~10.0.0" rc-steps "~4.1.0" rc-switch "~3.2.0" - rc-table "~7.11.0" - rc-tabs "~11.7.0" + rc-table "~7.25.3" + rc-tabs "~11.16.0" rc-textarea "~0.3.0" - rc-tooltip "~5.0.0" - rc-tree "~4.0.0" - rc-tree-select "~4.2.0" - rc-upload "~3.3.1" - rc-util "^5.1.0" + rc-tooltip "~5.2.0" + rc-tree "~5.6.5" + rc-tree-select "~5.4.0" + rc-trigger "^5.2.10" + rc-upload "~4.3.0" + rc-util "^5.22.5" scroll-into-view-if-needed "^2.2.25" - warning "^4.0.3" anymatch@^2.0.0: version "2.0.0" @@ -476,10 +479,10 @@ async-each@^1.0.1: resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== -async-validator@^3.0.3: - version "3.3.0" - resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.3.0.tgz#1d92193bbe60d6d6c8b246692c7005e9ed14a8ee" - integrity sha512-cAHGD9EL8aCqWXjnb44q94MWiDFzUo1tMhvLb2WzcpWqGiKugsjWG9cvl+jPgkPca7asNbsBU3fa0cwkI/P+Xg== +async-validator@^4.1.0: + version "4.2.5" + resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.2.5.tgz#c96ea3332a521699d0afaaceed510a54656c6339" + integrity sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg== async@^2.5.0, async@^2.6.2: version "2.6.3" @@ -846,6 +849,11 @@ classnames@2.x, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classna resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q== +classnames@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" + integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== + cliui@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" @@ -1100,15 +1108,15 @@ cyclist@^1.0.1: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= -date-fns@^2.15.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.15.0.tgz#424de6b3778e4e69d3ff27046ec136af58ae5d5f" - integrity sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ== +date-fns@2.x: + version "2.29.1" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.1.tgz#9667c2615525e552b5135a3116b95b1961456e60" + integrity sha512-dlLD5rKaKxpFdnjrs+5azHDFOPEu4ANy/LTh04A1DTzMM7qoajmKCBc8pkKRFT41CNzw+4gQh79X5C+Jq27HAw== -dayjs@^1.8.30: - version "1.8.32" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.32.tgz#66c48b95c397d9f7907e89bd29f78b3d19d40294" - integrity sha512-V91aTRu5btP+uzGHaaOfodckEfBWhmi9foRP7cauAO1PTB8+tZ9o0Jec7q6TIIRY1N4q1IfiKsZunkB/AEWqMQ== +dayjs@1.x: + version "1.11.4" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.4.tgz#3b3c10ca378140d8917e06ebc13a4922af4f433e" + integrity sha512-Zj/lPM5hOvQ1Bf7uAvewDaUcsJoI6JmNqmHhHl3nyumwe0XHwt8sWdOVAPACJzCebL8gQCi+K49w7iKWnGwX9g== debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" @@ -1853,13 +1861,6 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoist-non-react-statics@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" - integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== - dependencies: - react-is "^16.7.0" - homedir-polyfill@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" @@ -2023,11 +2024,6 @@ ini@^1.3.4: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== -insert-css@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/insert-css/-/insert-css-2.0.0.tgz#eb5d1097b7542f4c79ea3060d3aee07d053880f4" - integrity sha1-610Ql7dUL0x56jBg067gfQU4gPQ= - internal-ip@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" @@ -2385,17 +2381,17 @@ lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== -lodash@^4.17.20: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== +lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== loglevel@^1.6.1: version "1.6.8" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: +loose-envify@^1.1.0, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -2464,6 +2460,11 @@ mem@^4.0.0: mimic-fn "^2.0.0" p-is-promise "^2.0.0" +memoize-one@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045" + integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw== + memory-fs@^0.4.1, memory-fs@~0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" @@ -2544,14 +2545,6 @@ mimic-fn@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mini-store@^3.0.1: - version "3.0.5" - resolved "https://registry.yarnpkg.com/mini-store/-/mini-store-3.0.5.tgz#1b3808ee5e8173ecdcbf43b029137e9a72bb9fb8" - integrity sha512-A7f0+d7TEvjJNY2K+splh2OG3AhmoPoiF3VntlAcJuBzryMumOF9LAVzg8mRJPPbCkz7mlWQg9MCMQPR2auftA== - dependencies: - hoist-non-react-statics "^3.3.2" - shallowequal "^1.0.2" - minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -2605,11 +2598,16 @@ mkdirp@^0.5.1, mkdirp@~0.5.0: dependencies: minimist "^1.2.5" -moment@^2.24.0, moment@^2.25.3: +moment@^2.24.0: version "2.27.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d" integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ== +moment@^2.29.2: + version "2.29.4" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -2806,7 +2804,7 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -omit.js@^2.0.0, omit.js@^2.0.2: +omit.js@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-2.0.2.tgz#dd9b8436fab947a5f3ff214cb2538631e313ec2f" integrity sha512-hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg== @@ -2984,11 +2982,6 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - picomatch@^2.0.4, picomatch@^2.2.1: version "2.2.2" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" @@ -3202,13 +3195,6 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== -raf@^3.4.0, raf@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" - integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA== - dependencies: - performance-now "^2.1.0" - randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -3250,25 +3236,17 @@ rc-align@^4.0.0: rc-util "^5.0.1" resize-observer-polyfill "^1.5.1" -rc-animate@^3.0.0, rc-animate@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-3.1.0.tgz#051b689c2c7194e4c8ae016d32a0e5f9de6c8baa" - integrity sha512-8FsM+3B1H+0AyTyGggY6JyVldHTs1CyYT8CfTmG/nGHHXlecvSLeICJhcKgRLjUiQlctNnRtB1rwz79cvBVmrw== - dependencies: - "@ant-design/css-animation" "^1.7.2" - classnames "^2.2.6" - raf "^3.4.0" - rc-util "^5.0.1" - -rc-cascader@~1.4.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-1.4.1.tgz#cbbb4c8358953675b45cc8e53d3ee2b925b2ec5d" - integrity sha512-+4rZGOhcWIx2yvvfu+kCtoMenQVx7j4mbJdymwtt0w1PLUNa81jbCuGqqFGZ089eYGO23rKd6Kg6HEn+zSLyqA== +rc-cascader@~3.6.0: + version "3.6.1" + resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.6.1.tgz#2e94fb3ed770ffd71d87ebcf17a9b44a6442e76f" + integrity sha512-+GmN2Z0IybKT45t0Z94jkjmsOHGxAliobR2tzt05/Gw0AKBYLHX5bdvsVXR7abPnarYyYzZ/cWe8CoFgDjAFNw== dependencies: + "@babel/runtime" "^7.12.5" array-tree-filter "^2.1.0" - rc-trigger "^5.0.4" - rc-util "^5.0.1" - warning "^4.0.1" + classnames "^2.3.1" + rc-select "~14.1.0" + rc-tree "~5.6.3" + rc-util "^5.6.1" rc-checkbox@~2.3.0: version "2.3.1" @@ -3278,10 +3256,10 @@ rc-checkbox@~2.3.0: "@babel/runtime" "^7.10.1" classnames "^2.2.1" -rc-collapse@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.0.tgz#4ce5e612568c5fbeaf368cc39214471c1461a1a1" - integrity sha512-EwpNPJcLe7b+5JfyaxM9ZNnkCgqArt3QQO0Cr5p5plwz/C9h8liAmjYY5I4+hl9lAjBqb7ZwLu94+z+rt5g1WQ== +rc-collapse@~3.3.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.3.1.tgz#fc66d4c9cfeaf41e932b2de6da2d454874aee55a" + integrity sha512-cOJfcSe3R8vocrF8T+PgaHDrgeA1tX+lwfhwSj60NX9QVRidsILIbRNDLD6nAzmcvVC5PWiIRiR4S1OobxdhCg== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -3289,106 +3267,99 @@ rc-collapse@~3.1.0: rc-util "^5.2.1" shallowequal "^1.1.0" -rc-dialog@~8.4.0: - version "8.4.6" - resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-8.4.6.tgz#6a0ff815539b68e705cb9d2fc940a381039d113f" - integrity sha512-tTWp54h4zoCNoZFtTz+z1pOQYZCMsYazVEmHXJxWGOr3TgZmL/j9Wl81oKXW5PfqQ5g5JJjbUdKf72n+V+uvwA== +rc-dialog@~8.9.0: + version "8.9.0" + resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-8.9.0.tgz#04dc39522f0321ed2e06018d4a7e02a4c32bd3ea" + integrity sha512-Cp0tbJnrvPchJfnwIvOMWmJ4yjX3HWFatO6oBFD1jx8QkgsQCR0p8nUWAKdd3seLJhEC39/v56kZaEjwp9muoQ== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" rc-motion "^2.3.0" - rc-util "^5.0.1" + rc-util "^5.21.0" -rc-drawer@~4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-4.1.0.tgz#d7bf0bc030300b62d282bc04e053b9acad6b08b4" - integrity sha512-kjeQFngPjdzAFahNIV0EvEBoIKMOnvUsAxpkSPELoD/1DuR4nLafom5ryma+TIxGwkFJ92W6yjsMi1U9aiOTeQ== +rc-drawer@~5.1.0-alpha.1: + version "5.1.0-alpha.3" + resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-5.1.0-alpha.3.tgz#a516131bd36f36b886c00ece027837050cbd3c68" + integrity sha512-8SR6VD3ms0KhfwGa0KIhCUr/3p8iIuxIqo8cqizZzQKUjSGU0IcB/fteDV3IVRGMqVHhSSQp4hzvYfZsOI+kOA== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" - rc-util "^5.0.1" + rc-motion "^2.6.1" + rc-util "^5.21.2" -rc-dropdown@^3.1.3, rc-dropdown@~3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-3.2.0.tgz#da6c2ada403842baee3a9e909a0b1a91ba3e1090" - integrity sha512-j1HSw+/QqlhxyTEF6BArVZnTmezw2LnSmRk6I9W7BCqNCKaRwleRmMMs1PHbuaG8dKHVqP6e21RQ7vPBLVnnNw== +rc-dropdown@~4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-4.0.1.tgz#f65d9d3d89750241057db59d5a75e43cd4576b68" + integrity sha512-OdpXuOcme1rm45cR0Jzgfl1otzmU4vuBVb+etXM8vcaULGokAKVpKlw8p6xzspG7jGd/XxShvq+N3VNEfk/l5g== dependencies: - "@babel/runtime" "^7.10.1" + "@babel/runtime" "^7.18.3" classnames "^2.2.6" - rc-trigger "^5.0.4" + rc-trigger "^5.3.1" + rc-util "^5.17.0" -rc-field-form@~1.17.0: - version "1.17.3" - resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.17.3.tgz#593d31c51071d4f6ba40d73b9f8018848230577c" - integrity sha512-EocLncL7uDkxAGywqbtDXe6r8xbru9Yz94JHY7X6XsIdc8sAIGzafMYFaX0hHuwBGbvo7mv7L74cGCuD7xK5Fw== +rc-field-form@~1.27.0: + version "1.27.1" + resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.27.1.tgz#11d61ccb43679e71fdbbff0d821326202554df84" + integrity sha512-RShegnwFu6TH8tl2olCxn+B4Wyh5EiQH8c/7wucbkLNyue05YiH5gomUAg1vbZjp71yFKwegClctsEG5CNBWAA== dependencies: - "@babel/runtime" "^7.8.4" - async-validator "^3.0.3" - rc-util "^5.0.0" + "@babel/runtime" "^7.18.0" + async-validator "^4.1.0" + rc-util "^5.8.0" -rc-image@~4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-4.2.0.tgz#3b7a977f9ecfbac046296c2908d99cb1f8795c65" - integrity sha512-yGqq6wPrIn86hMfC1Hl7M3NNS6zqnl9dvFWJg/StuI86jZBU0rm9rePTfKs+4uiwU3HXxpfsXlaG2p8GWRDLiw== +rc-image@~5.7.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.7.0.tgz#e1a3b21099feb3fb9bf8ef3ce12c3fc11a8c1148" + integrity sha512-v6dzSgYfYrH4liKmOZKZZO+x21sJ9KPXNinBfkAoQg2Ihcd5QZ+P/JjB7v60X981XTPGjegy8U17Z8VUX4V36g== dependencies: - "@ant-design/icons" "^4.2.2" "@babel/runtime" "^7.11.2" classnames "^2.2.6" - rc-dialog "~8.4.0" + rc-dialog "~8.9.0" rc-util "^5.0.6" -rc-input-number@~6.1.0: - version "6.1.2" - resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-6.1.2.tgz#6663eda0ae6b75e464e63df375d29308cebb0ed8" - integrity sha512-UvP0tpOUeGetx6caS8RzBs3Du+NwPUn9ijQ3LeR1jOmzjXNuXvv58U6hvIXSHx/4ulPleQ5BAQP/aLTsFB4yGw== +rc-input-number@~7.3.5: + version "7.3.6" + resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-7.3.6.tgz#54d66bd3fdaef0abfded4c734a12ac6d9461ebab" + integrity sha512-Se62oMOBn9HwF/gSag+YtAYyKZsjJzEsqmyAJHAnAvPfjZJOu7dLMlQRwBbTtELbKXM/Y5Fztcq8CW2Y9f49qA== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" - rc-util "^5.0.1" + rc-util "^5.23.0" + +rc-input@~0.0.1-alpha.5: + version "0.0.1-alpha.7" + resolved "https://registry.yarnpkg.com/rc-input/-/rc-input-0.0.1-alpha.7.tgz#53e3f13871275c21d92b51f80b698f389ad45dd3" + integrity sha512-eozaqpCYWSY5LBMwlHgC01GArkVEP+XlJ84OMvdkwUnJBSv83Yxa15pZpn7vACAj84uDC4xOA2CoFdbLuqB08Q== + dependencies: + "@babel/runtime" "^7.11.1" + classnames "^2.2.1" + rc-util "^5.18.1" -rc-mentions@~1.5.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.5.2.tgz#94559a369de73e7cc92f343badaf94499fb410a7" - integrity sha512-GqV0tOtHY3pLpOsFCxJ2i6Ad8AVfxFmz0NlD/8rb8IG8pMpthJKcdfnXlNZRx3Fa9O4YEgJpdSY1WEbmlx2DWQ== +rc-mentions@~1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.9.0.tgz#0ddff6ab442dce58efa7b9f5ae561b0051173334" + integrity sha512-CSC2t8WxK8daS8lylJcquzCgKz4bXLAVNrSHXlTI8fNUy4toot8Sv79wT4fcP/bYgdt07/e3RXzkZfX6xjYYow== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" - rc-menu "^8.0.1" + rc-menu "~9.6.0" rc-textarea "^0.3.0" rc-trigger "^5.0.4" - rc-util "^5.0.1" - -rc-menu@^8.0.1: - version "8.5.0" - resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-8.5.0.tgz#bf1fff9855d5554bf95b84698ca3ff4724c9b0c6" - integrity sha512-zEf3gKcdEKrI2/GpotOyIuVqrqEEJLLb+bLBTud+5b6Y70xwUH8IZvK6kXdHdqEnJGEZmq5NIy8Ufcr+HOYGxQ== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "2.x" - mini-store "^3.0.1" - omit.js "^2.0.0" - rc-animate "^3.1.0" - rc-trigger "^4.2.0" - rc-util "^5.0.1" - resize-observer-polyfill "^1.5.0" - shallowequal "^1.1.0" + rc-util "^5.22.5" -rc-menu@^8.6.1, rc-menu@~8.10.0: - version "8.10.1" - resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-8.10.1.tgz#5637d85760ea6bd6ead49f44ae29686c5cc59798" - integrity sha512-HmTOLPkSrz5RcdDopD4+nI95YXR2DzdSq9ek3NX2EVgD1UHknlp1QAEJ5MompYdAqdtOspJUqgM/zNt0iQALOw== +rc-menu@~9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.6.0.tgz#3263a729a81ae49cfdadee112e97d3c702922829" + integrity sha512-d26waws42U/rVwW/+rOE2FN9pX6wUc9bDy38vVQYoie6gE85auWIpl5oChGlnW6nE2epnTwUsgWl8ipOPgmnUA== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" - mini-store "^3.0.1" - omit.js "^2.0.0" - rc-motion "^2.0.1" + rc-motion "^2.4.3" + rc-overflow "^1.2.0" rc-trigger "^5.1.2" - rc-util "^5.5.0" - resize-observer-polyfill "^1.5.0" + rc-util "^5.12.0" shallowequal "^1.1.0" -rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motion@^2.4.0: +rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motion@^2.3.4: version "2.4.1" resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.4.1.tgz#323f47c8635e6b2bc0cba2dfad25fc415b58e1dc" integrity sha512-TWLvymfMu8SngPx5MDH8dQ0D2RYbluNTfam4hY/dNNx9RQ3WtGuZ/GXHi2ymLMzH+UNd6EEFYkOuR5JTTtm8Xg== @@ -3397,45 +3368,65 @@ rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motio classnames "^2.2.1" rc-util "^5.2.1" -rc-notification@~4.5.2: - version "4.5.4" - resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.5.4.tgz#1292e163003db4b9162c856a4630e5d0f1359356" - integrity sha512-VsN0ouF4uglE5g3C9oDsXLNYX0Sz++ZNUFYCswkxhpImYJ9u6nJOpyA71uOYDVCu6bAF54Y5Hi/b+EcnMzkepg== +rc-motion@^2.4.3, rc-motion@^2.4.4, rc-motion@^2.6.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.6.2.tgz#3d31f97e41fb8e4f91a4a4189b6a98ac63342869" + integrity sha512-4w1FaX3dtV749P8GwfS4fYnFG4Rb9pxvCYPc/b2fw1cmlHJWNNgOFIz7ysiD+eOrzJSvnLJWlNQQncpNMXwwpg== + dependencies: + "@babel/runtime" "^7.11.1" + classnames "^2.2.1" + rc-util "^5.21.0" + +rc-notification@~4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.6.0.tgz#4e76fc2d0568f03cc93ac18c9e20763ebe29fa46" + integrity sha512-xF3MKgIoynzjQAO4lqsoraiFo3UXNYlBfpHs0VWvwF+4pimen9/H1DYLN2mfRWhHovW6gRpla73m2nmyIqAMZQ== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" rc-motion "^2.2.0" - rc-util "^5.0.1" + rc-util "^5.20.1" -rc-pagination@~3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.3.tgz#afd779839fefab2cb14248d5e7b74027960bb48b" - integrity sha512-Z7CdC4xGkedfAwcUHPtfqNhYwVyDgkmhkvfsmoByCOwAd89p42t5O5T3ORar1wRmVWf3jxk/Bf4k0atenNvlFA== +rc-overflow@^1.0.0, rc-overflow@^1.2.0: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc-overflow/-/rc-overflow-1.2.8.tgz#40f140fabc244118543e627cdd1ef750d9481a88" + integrity sha512-QJ0UItckWPQ37ZL1dMEBAdY1dhfTXFL9k6oTTcyydVwoUNMnMqCGqnRNA98axSr/OeDKqR6DVFyi8eA5RQI/uQ== + dependencies: + "@babel/runtime" "^7.11.1" + classnames "^2.2.1" + rc-resize-observer "^1.0.0" + rc-util "^5.19.2" + +rc-pagination@~3.1.17: + version "3.1.17" + resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.17.tgz#91e690aa894806e344cea88ea4a16d244194a1bd" + integrity sha512-/BQ5UxcBnW28vFAcP2hfh+Xg15W0QZn8TWYwdCApchMH1H0CxiaUUcULP8uXcFM1TygcdKWdt3JqsL9cTAfdkQ== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" -rc-picker@~2.4.1: - version "2.4.3" - resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.4.3.tgz#ad15ee1d85e4b3e213ec66215ecd39e6a09be995" - integrity sha512-tOIHslTQKpoGNmbpp6YOBwS39dQSvtAuhOm3bWCkkc4jCqUqeR/velCwqefZX1BX4+t1gUMc1dIia9XvOKrEkg== +rc-picker@~2.6.10: + version "2.6.10" + resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.6.10.tgz#8d0a473c079388bdb2d7358a2a54c7d5095893b4" + integrity sha512-9wYtw0DFWs9FO92Qh2D76P0iojUr8ZhLOtScUeOit6ks/F+TBLrOC1uze3IOu+u9gbDAjmosNWLKbBzx/Yuv2w== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" - date-fns "^2.15.0" - dayjs "^1.8.30" + date-fns "2.x" + dayjs "1.x" moment "^2.24.0" rc-trigger "^5.0.4" rc-util "^5.4.0" shallowequal "^1.1.0" -rc-progress@~3.1.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.1.2.tgz#38abc5f0b5fbda117bacc7283f5d1ce9fec0d3fa" - integrity sha512-MbT/59fWMVIXv2ac5nlah7xncu8twrIGADCnjsDiI2Qua8aDSzxoDfPAQSz2+wxA2LEsfFW+5Blqg3hcLQDSQw== +rc-progress@~3.3.2: + version "3.3.3" + resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.3.3.tgz#eb9bffbacab1534f2542f9f6861ce772254362b1" + integrity sha512-MDVNVHzGanYtRy2KKraEaWeZLri2ZHWIRyaE1a9MQ2MuJ09m+Wxj5cfcaoaR6z5iRpHpA59YeUxAlpML8N4PJw== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" + rc-util "^5.16.1" rc-rate@~2.9.0: version "2.9.1" @@ -3446,7 +3437,7 @@ rc-rate@~2.9.0: classnames "^2.2.5" rc-util "^5.0.1" -rc-resize-observer@^0.2.0, rc-resize-observer@^0.2.3: +rc-resize-observer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-0.2.3.tgz#8268284d1766d163240b1682661ae7b59bc4523d" integrity sha512-dEPCGX15eRRnu+TNBIGyEghpzE24fTDW8pHdJPJS/kCR3lafFqBLqKzBgZW6pMUuM70/ZDyFQ0Kynx9kWsXRNw== @@ -3466,28 +3457,47 @@ rc-resize-observer@^1.0.0: rc-util "^5.0.0" resize-observer-polyfill "^1.5.1" -rc-select@^11.1.1, rc-select@~11.5.3: - version "11.5.3" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-11.5.3.tgz#682913f3669596fb794e2b4a5c619974c5ab45d1" - integrity sha512-ASSO4J/ayfbQQ+KOEounIMGhySDHpQtrIuH1WEABOBy8HgKec8kOLmyLH+YIXSUDnTf/gtxmflgFtl7sQ9pkSw== +rc-resize-observer@^1.1.0, rc-resize-observer@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.2.0.tgz#9f46052f81cdf03498be35144cb7c53fd282c4c7" + integrity sha512-6W+UzT3PyDM0wVCEHfoW3qTHPTvbdSgiA43buiy8PzmeMnfgnDeb9NjdimMXMl3/TcrvvWl5RRVdp+NqcR47pQ== + dependencies: + "@babel/runtime" "^7.10.1" + classnames "^2.2.1" + rc-util "^5.15.0" + resize-observer-polyfill "^1.5.1" + +rc-segmented@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/rc-segmented/-/rc-segmented-2.1.0.tgz#0e0afe646c1a0e44a0e18785f518c42633ec8efc" + integrity sha512-hUlonro+pYoZcwrH6Vm56B2ftLfQh046hrwif/VwLIw1j3zGt52p5mREBwmeVzXnSwgnagpOpfafspzs1asjGw== + dependencies: + "@babel/runtime" "^7.11.1" + classnames "^2.2.1" + rc-motion "^2.4.4" + rc-util "^5.17.0" + +rc-select@~14.1.0, rc-select@~14.1.1: + version "14.1.9" + resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.1.9.tgz#9c9eceff00920ad8a0a53b77b76afc177ffe5ab4" + integrity sha512-DK01+Q7oCWr5jVPiEp/BTQ8xCB4rI4LfXzZtSmBWJhOMuibyZD1Vlz/DlVKCUFmtBM4SzG4/SltGHoGlcbCqiw== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" rc-motion "^2.0.1" + rc-overflow "^1.0.0" rc-trigger "^5.0.4" - rc-util "^5.0.1" + rc-util "^5.16.1" rc-virtual-list "^3.2.0" - warning "^4.0.3" -rc-slider@~9.6.1: - version "9.6.5" - resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-9.6.5.tgz#826cd7ba69d87c48b258baa3422a25b7f8c5620c" - integrity sha512-XRUJDK668hy8MwGnHzZlXCQXXIOUnEs4m2vwk1jgDILVBxI0GwGOlC6T499pYY+NEWg8YgdCOAucFs/+X5WHpg== +rc-slider@~10.0.0: + version "10.0.1" + resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.0.1.tgz#7058c68ff1e1aa4e7c3536e5e10128bdbccb87f9" + integrity sha512-igTKF3zBet7oS/3yNiIlmU8KnZ45npmrmHlUUio8PNbIhzMcsh+oE/r2UD42Y6YD2D/s+kzCQkzQrPD6RY435Q== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" - rc-tooltip "^5.0.1" - rc-util "^5.0.0" + rc-util "^5.18.1" shallowequal "^1.1.0" rc-steps@~4.1.0: @@ -3508,26 +3518,26 @@ rc-switch@~3.2.0: classnames "^2.2.1" rc-util "^5.0.1" -rc-table@~7.11.0: - version "7.11.3" - resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.11.3.tgz#a352a222664b1b746f872fb35c67a67934d73eab" - integrity sha512-YyZry1CdqUrcH7MmWtLQZVvVZWbmTEbI5m650AZ+zYw4D5VF701samkMYl5z/H9yQFr+ugvDtXcya+e3vwRkMQ== +rc-table@~7.25.3: + version "7.25.3" + resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.25.3.tgz#a2941d4fde4c181e687e97a294faca8e4122e26d" + integrity sha512-McsLJ2rg8EEpRBRYN4Pf9gT7ZNYnjvF9zrBpUBBbUX/fxk+eGi5ff1iPIhMyiHsH71/BmTUzX9nc9XqupD0nMg== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" - rc-resize-observer "^0.2.0" - rc-util "^5.4.0" + rc-resize-observer "^1.1.0" + rc-util "^5.22.5" shallowequal "^1.1.0" -rc-tabs@~11.7.0: - version "11.7.3" - resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-11.7.3.tgz#32a30e59c6992d60fb58115ba0bf2652b337ed43" - integrity sha512-5nd2NVss9TprPRV9r8N05SjQyAE7zDrLejxFLcbJ+BdLxSwnGnk3ws/Iq0smqKZUnPQC0XEvnpF3+zlllUUT2w== +rc-tabs@~11.16.0: + version "11.16.1" + resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-11.16.1.tgz#7c57b6a092d9d0e2df54413b0319f195c27214a9" + integrity sha512-bR7Dap23YyfzZQwtKomhiFEFzZuE7WaKWo+ypNRSGB9PDKSc6tM12VP8LWYkvmmQHthgwP0WRN8nFbSJWuqLYw== dependencies: "@babel/runtime" "^7.11.2" classnames "2.x" - rc-dropdown "^3.1.3" - rc-menu "^8.6.1" + rc-dropdown "~4.0.0" + rc-menu "~9.6.0" rc-resize-observer "^1.0.0" rc-util "^5.5.0" @@ -3541,58 +3551,36 @@ rc-textarea@^0.3.0, rc-textarea@~0.3.0: omit.js "^2.0.0" rc-resize-observer "^0.2.3" -rc-tooltip@^5.0.1, rc-tooltip@~5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-5.0.1.tgz#b82c4259604d2cb62ca610ed7932dd37fc6ef61d" - integrity sha512-3AnxhUS0j74xAV3khrKw8o6rg+Ima3nw09DJBezMPnX3ImQUAnayWsPSlN1mEnihjA43rcFkGM1emiKE+CXyMQ== +rc-tooltip@~5.2.0: + version "5.2.2" + resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-5.2.2.tgz#e5cafa8ecebf78108936a0bcb93c150fa81ac93b" + integrity sha512-jtQzU/18S6EI3lhSGoDYhPqNpWajMtS5VV/ld1LwyfrDByQpYmw/LW6U7oFXXLukjfDHQ7Ju705A82PRNFWYhg== dependencies: "@babel/runtime" "^7.11.2" + classnames "^2.3.1" rc-trigger "^5.0.0" -rc-tree-select@~4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-4.2.0.tgz#ca19163b2ccfe0772fd7b8148266dddd197d0fe1" - integrity sha512-VrrvBiOov6WR44RTGMqSw1Dmodg6Y++EH6a6R0ew43qsV4Ob0FGYRgoX811kImtt2Z+oAPJ6zZXN4WKtsQd3Gw== +rc-tree-select@~5.4.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.4.0.tgz#c94b961aca68689f5ee3a43e33881cf693d195ef" + integrity sha512-reRbOqC7Ic/nQocJAJeCl4n6nJUY3NoqiwRXKvhjgZJU7NGr9vIccXEsY+Lghkw5UMpPoxGsIJB0jiAvM18XYA== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" - rc-select "^11.1.1" - rc-tree "^4.0.0" - rc-util "^5.0.5" + rc-select "~14.1.0" + rc-tree "~5.6.1" + rc-util "^5.16.1" -rc-tree@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-4.1.0.tgz#2b98ebaf4c57e0a68a70411e92ecad4139792b85" - integrity sha512-zwqjZ3hOayq0PPwxOgRsYyW4PJxPJVwTERWtzAKc4OUjWn1LVainQPWIjNKTcXbikcikRb5cyV5PJLxD3buwag== +rc-tree@~5.6.1, rc-tree@~5.6.3, rc-tree@~5.6.5: + version "5.6.6" + resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.6.6.tgz#c04253d8f8345ec52fc196dec2be06c7e708125b" + integrity sha512-HI/q4D4AHOp48OZcBUvJFWkI5OfnZivvGYI0xzI0dy0Mita2KcTGZv7/Yl6Aq3bL3od3x5AqAXq/7qxR3x4Kkg== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" rc-motion "^2.0.1" - rc-util "^5.0.0" - rc-virtual-list "^3.0.1" - -rc-tree@~4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-4.0.0.tgz#2f972b4a5e23ea17df05ec9f7ec43de350bea3bf" - integrity sha512-C2xlkA+/IypkHBPzbpAJGVWJh2HjeRbYCusA/m5k09WT6hQT0nC7LtLVmnb7QZecdBQPhoOgQh8gPwBR+xEMjQ== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "2.x" - rc-motion "^2.0.1" - rc-util "^5.0.0" - rc-virtual-list "^3.0.1" - -rc-trigger@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-4.3.0.tgz#94ea1851d123359716d1dc3030083c015a92ecfb" - integrity sha512-jnGNzosXmDdivMBjPCYe/AfOXTpJU2/xQ9XukgoXDQEoZq/9lcI1r7eUIfq70WlWpLxlUEqQktiV3hwyy6Nw9g== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.6" - raf "^3.4.1" - rc-align "^4.0.0" - rc-animate "^3.0.0" - rc-util "^5.0.1" + rc-util "^5.16.1" + rc-virtual-list "^3.4.8" rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2: version "5.2.0" @@ -3605,12 +3593,23 @@ rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2: rc-motion "^2.0.0" rc-util "^5.5.0" -rc-upload@~3.3.1: - version "3.3.4" - resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-3.3.4.tgz#b0668d18661595c69c0621cec220fd116cc79952" - integrity sha512-v2sirR4JL31UTHD/f0LGUdd+tpFaOVUTPeIEjAXRP9kRN8TFhqOgcXl5ixtyqj90FmtRUmKmafCv0EmhBQUHqQ== +rc-trigger@^5.2.10, rc-trigger@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.3.1.tgz#acafadf3eaf384e7f466c303bfa0f34c8137d7b8" + integrity sha512-5gaFbDkYSefZ14j2AdzucXzlWgU2ri5uEjkHvsf1ynRhdJbKxNOnw4PBZ9+FVULNGFiDzzlVF8RJnR9P/xrnKQ== dependencies: - "@babel/runtime" "^7.10.1" + "@babel/runtime" "^7.18.3" + classnames "^2.2.6" + rc-align "^4.0.0" + rc-motion "^2.0.0" + rc-util "^5.19.2" + +rc-upload@~4.3.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-4.3.4.tgz#83ff7d3867631c37adbfd72ea3d1fd7e97ca84af" + integrity sha512-uVbtHFGNjHG/RyAfm9fluXB6pvArAGyAx8z7XzXXyorEgVIWj6mOlriuDm0XowDHYz4ycNK0nE0oP3cbFnzxiQ== + dependencies: + "@babel/runtime" "^7.18.3" classnames "^2.2.5" rc-util "^5.2.0" @@ -3622,23 +3621,24 @@ rc-util@^5.0.0, rc-util@^5.0.1: react-is "^16.12.0" shallowequal "^1.1.0" -rc-util@^5.0.5: - version "5.0.6" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.0.6.tgz#2b828bc87a818a66384b813f76a561ad4609e9b0" - integrity sha512-uLGxF9WjbpJSjd6iDnIjl8ZeMUglpcuh1DwO26aaXh++yAmlB6eIAJMUwwJCuqJvo4quCvsDPg1VkqHILc4U0A== +rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.4.0, rc-util@^5.5.0: + version "5.6.2" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.6.2.tgz#7c3f4516a8a6215a57d8d41b65c1b9925d915d89" + integrity sha512-AKG+5l3EXRnArgf8fm14CClkf20CovgV38juTz/uiQEHLa0nDyoJWw/7BvIIny893Pvwm3TTwokxIs3rsqZ6kw== dependencies: react-is "^16.12.0" shallowequal "^1.1.0" -rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.1.0, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.4.0, rc-util@^5.5.0: - version "5.6.2" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.6.2.tgz#7c3f4516a8a6215a57d8d41b65c1b9925d915d89" - integrity sha512-AKG+5l3EXRnArgf8fm14CClkf20CovgV38juTz/uiQEHLa0nDyoJWw/7BvIIny893Pvwm3TTwokxIs3rsqZ6kw== +rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.21.2, rc-util@^5.22.5, rc-util@^5.23.0, rc-util@^5.6.1, rc-util@^5.8.0, rc-util@^5.9.4: + version "5.23.0" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.23.0.tgz#a583b1ec3e1832a80eced7a700a494af0b590743" + integrity sha512-lgm6diJ/pLgyfoZY59Vz7sW4mSoQCgozqbBye9IJ7/mb5w5h4T7h+i2JpXAx/UBQxscBZe68q0sP7EW+qfkKUg== dependencies: + "@babel/runtime" "^7.18.3" react-is "^16.12.0" shallowequal "^1.1.0" -rc-virtual-list@^3.0.1, rc-virtual-list@^3.2.0: +rc-virtual-list@^3.2.0: version "3.2.4" resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.2.4.tgz#53e918f89edda0db4d8fcc810757c0daac7928de" integrity sha512-/rX09+crUu43tltO5YT++Ix5W2unBrkVrH1FHaUzpc7VepWuxc2cD4d9enWOElJsziB6MlopaAUvbRSU5FtPNw== @@ -3647,6 +3647,15 @@ rc-virtual-list@^3.0.1, rc-virtual-list@^3.2.0: rc-resize-observer "^1.0.0" rc-util "^5.0.7" +rc-virtual-list@^3.4.8: + version "3.4.8" + resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.8.tgz#c24c10c6940546b7e2a5e9809402c6716adfd26c" + integrity sha512-qSN+Rv4i/E7RCTvTMr1uZo7f3crJJg/5DekoCagydo9zsXrxj07zsFSxqizqW+ldGA16lwa8So/bIbV9Ofjddg== + dependencies: + classnames "^2.2.6" + rc-resize-observer "^1.0.0" + rc-util "^5.15.0" + react-dom@16.13.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f" @@ -3657,7 +3666,7 @@ react-dom@16.13.1: prop-types "^15.6.2" scheduler "^0.19.1" -react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.12.0, react-is@^16.8.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -3760,7 +3769,7 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1: +resize-observer-polyfill@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== @@ -3981,7 +3990,7 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shallowequal@^1.0.2, shallowequal@^1.1.0: +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== @@ -4533,13 +4542,6 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -warning@^4.0.1, warning@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" - integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== - dependencies: - loose-envify "^1.0.0" - watchpack-chokidar2@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0" diff --git a/build.sbt b/build.sbt index 5ab8478..b1f49f4 100644 --- a/build.sbt +++ b/build.sbt @@ -162,7 +162,9 @@ lazy val antd = useYarn := true, webpackDevServerPort := 8006, stFlavour := Flavour.Slinky, - Compile / npmDependencies ++= Seq("antd" -> "4.9.4") + // Workaround for https://github.com/ScalablyTyped/Converter/issues/467 + stIgnore += "rc-tree", + Compile / npmDependencies ++= Seq("antd" -> "4.22.3") ) /** From aeadedf6333414dd7d00bd9f3d3be5b1f564cb69 Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Wed, 3 Aug 2022 22:37:31 +1200 Subject: [PATCH 02/11] Workaround select changes --- antd/project/build.properties | 1 + antd/yarn.lock | 2 +- build.sbt | 89 +++++++++++++++++++++++------------ 3 files changed, 62 insertions(+), 30 deletions(-) create mode 100644 antd/project/build.properties diff --git a/antd/project/build.properties b/antd/project/build.properties new file mode 100644 index 0000000..c8fcab5 --- /dev/null +++ b/antd/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.6.2 diff --git a/antd/yarn.lock b/antd/yarn.lock index 7d0e5e3..9516c56 100644 --- a/antd/yarn.lock +++ b/antd/yarn.lock @@ -334,7 +334,7 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -antd@*: +antd@4.22.3: version "4.22.3" resolved "https://registry.yarnpkg.com/antd/-/antd-4.22.3.tgz#c6d4ced17e9c21b55c6234595d962c5f9d6768db" integrity sha512-Nay1tO+G5Z9szmshK9TinOWclJnxOtSe7cr15EX64NGkZZyRoHX2xXOFQoYtBt4qfVfFvLf97m9on7fwgy1Svg== diff --git a/build.sbt b/build.sbt index b1f49f4..6f9d9ad 100644 --- a/build.sbt +++ b/build.sbt @@ -3,14 +3,15 @@ import java.nio.file.StandardCopyOption.REPLACE_EXISTING import scala.sys.process.Process -Global / stRemoteCache := RemoteCache.S3Aws( - bucket = "scalablytyped-demos", - region = "eu-central-1", - prefix = Some("st-cache") -) +//Global / stRemoteCache := RemoteCache.S3Aws( +// bucket = "scalablytyped-demos", +// region = "eu-central-1", +// prefix = Some("st-cache") +//) Global / onLoad := { - println("""* + println( + """* |* Welcome to ScalablyTyped demos! |* |* These demos demonstrate how to use third party react components with Slinky. @@ -28,17 +29,17 @@ Global / onLoad := { //Global / stQuiet := true /** - * Custom task to start demo with webpack-dev-server, use as `/start`. - * Just `start` also works, and starts all frontend demos - * - * After that, the incantation is this to watch and compile on change: - * `~/fastOptJS::webpack` - */ + * Custom task to start demo with webpack-dev-server, use as `/start`. + * Just `start` also works, and starts all frontend demos + * + * After that, the incantation is this to watch and compile on change: + * `~/fastOptJS::webpack` + */ lazy val start = TaskKey[Unit]("start") /** Say just `dist` or `/dist` to make a production bundle in - * `docs` for github publishing - */ + * `docs` for github publishing + */ lazy val dist = TaskKey[File]("dist") lazy val baseSettings: Project => Project = @@ -122,8 +123,8 @@ lazy val `semantic-ui-react-kitchensink` = project ) /** Note: This can't use scalajs-bundler (at least I don't know how), - * so we run yarn ourselves with an external package.json. - */ + * so we run yarn ourselves with an external package.json. + */ lazy val `storybook-react` = project .enablePlugins(ScalablyTypedConverterExternalNpmPlugin) .configure(baseSettings) @@ -137,9 +138,10 @@ lazy val `storybook-react` = project baseDirectory.value }, stFlavour := Flavour.Slinky, + /** This is not suitable for development, but effective for demo. - * Run `yarn storybook` commands yourself, and run `~storybook-react/fastOptJS` from sbt - */ + * Run `yarn storybook` commands yourself, and run `~storybook-react/fastOptJS` from sbt + */ start := { (Compile / fastOptJS).value if (scala.util.Properties.isWin) Process("yarn storybook", baseDirectory.value).run() @@ -164,12 +166,41 @@ lazy val antd = stFlavour := Flavour.Slinky, // Workaround for https://github.com/ScalablyTyped/Converter/issues/467 stIgnore += "rc-tree", - Compile / npmDependencies ++= Seq("antd" -> "4.22.3") + Compile / npmDependencies ++= Seq("antd" -> "4.22.3"), + //Compile / npmDependencies ++= Seq("antd" -> "4.9.4"), + Compile / npmInstallDependencies := Def.task { + val dir = (Compile / npmInstallDependencies).value + fixAntdAutoComplete(dir) + fixAntdSelect(dir) + dir + }.value + ) + +lazy val fixAntdAutoComplete = (dir: File) => { + val autoComplete = dir / "node_modules" / "antd" / "lib" / "auto-complete" / "index.d.ts" + val input = IO.read(autoComplete) + val output = input + .replace( + "declare const Select: ((props: SelectProps & {", + "declare const Select: ((props: SelectProps & {", ) + IO.write(autoComplete, output) +} + +lazy val fixAntdSelect = (dir: File) => { + val autoComplete = dir / "node_modules" / "antd" / "lib" / "select" / "index.d.ts" + val input = IO.read(autoComplete) + val output = input + .replace( + "declare const RefAutoComplete: ((props: AutoCompleteProps & {", + "declare const RefAutoComplete: ((props: AutoCompleteProps & {" + ) + IO.write(autoComplete, output) +} /** - * Alias to launch material-ui in dev mode, recompiling on changes - */ + * Alias to launch material-ui in dev mode, recompiling on changes + */ addCommandAlias( "react-router-dom-dev", ";react-router-dom/fastOptJS::startWebpackDevServer;~react-router-dom/fastOptJS" @@ -189,8 +220,8 @@ lazy val `react-router-dom` = ) /** - * Alias to launch material-ui in dev mode, recompiling on changes - */ + * Alias to launch material-ui in dev mode, recompiling on changes + */ addCommandAlias("materialUiDev", ";material-ui/fastOptJS::startWebpackDevServer;~material-ui/fastOptJS") lazy val `material-ui` = project @@ -368,8 +399,8 @@ lazy val gojs = project ) /** Note: This can't use scalajs-bundler (at least I don't know how), - * so we run yarn ourselves with an external package.json. - */ + * so we run yarn ourselves with an external package.json. + */ lazy val `react-native` = project .enablePlugins(ScalablyTypedConverterExternalNpmPlugin) .configure(baseSettings) @@ -425,9 +456,9 @@ lazy val withCssLoading: Project => Project = ) /** - * Implement the `start` and `dist` tasks defined above. - * Most of this is really just to copy the index.html file around. - */ + * Implement the `start` and `dist` tasks defined above. + * Most of this is really just to copy the index.html file around. + */ lazy val browserProject: Project => Project = _.settings( start := { @@ -441,7 +472,7 @@ lazy val browserProject: Project => Project = distFolder.mkdirs() artifacts.foreach { artifact => val target = artifact.data.relativeTo(artifactFolder) match { - case None => distFolder / artifact.data.name + case None => distFolder / artifact.data.name case Some(relFile) => distFolder / relFile.toString } From a09118fa2760b59a3e6c5c9d15008cf1d696ad87 Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Thu, 4 Aug 2022 15:03:45 +1200 Subject: [PATCH 03/11] Fix build errors --- antd/src/main/scala/demo/App.scala | 54 ++++++++-------- .../src/main/scala/demo/CoordinatedDemo.scala | 4 +- build.sbt | 63 ++++++++++++++++--- 3 files changed, 87 insertions(+), 34 deletions(-) diff --git a/antd/src/main/scala/demo/App.scala b/antd/src/main/scala/demo/App.scala index 51d943b..93da388 100644 --- a/antd/src/main/scala/demo/App.scala +++ b/antd/src/main/scala/demo/App.scala @@ -16,17 +16,19 @@ import typings.antDesignIconsSvg.userOutlinedMod.{default => UserOutlinedIcon} import typings.antd.antdStrings import typings.antd.components.{List => AntList, _} import typings.antd.components.Form.{Form => FormItem} +import typings.antd.generatePickerMod.RangePickerDateProps +import typings.antd.mod import typings.antd.notificationMod.{ArgsProps, IconType, default => Notification} import typings.antd.tableInterfaceMod.{ColumnGroupType, ColumnType} +import typings.antd.tooltipMod.{TooltipProps, TooltipPropsWithTitle} import typings.moment.mod.Moment import typings.moment.mod.unitOfTime.DurationConstructor import typings.moment.{mod => moment} import typings.rcPicker.interfaceMod.{EventValue, RangeValue} import typings.rcPicker.rangePickerMod.RangeShowTimeObject -import typings.rcSelect.interfaceMod.OptionData -import typings.rcTreeSelect.interfaceMod.DataNode -import typings.rcTreeSelect.strategyUtilMod -import typings.react.mod.CSSProperties +import typings.rcSelect.selectMod +import typings.rcTreeSelect.{strategyUtilMod, treeSelectMod} +import typings.react.mod.{CSSProperties, RefAttributes} import typings.std.global.console import scala.scalajs.js @@ -103,14 +105,14 @@ object CSS extends js.Any ) .columnsVarargs( ColumnType[TableItem]() - .setTitle("Name") + .setTitle("Name": ReactElement) .setDataIndex("name") .setKey("name") .setRender((_, tableItem, _) => Tag(tableItem.name).build), ColumnGroupType[TableItem]( scala.scalajs.js.Array( - ColumnType[TableItem].setTitle("Age").setDataIndex("age").setKey("age"), - ColumnType[TableItem].setTitle("Address").setDataIndex("address").setKey("address") + ColumnType[TableItem].setTitle("Age": ReactElement).setDataIndex("age").setKey("age"), + ColumnType[TableItem].setTitle("Address": ReactElement).setDataIndex("address").setKey("address") ) ).setTitleReactElement("Age & Address") ) @@ -174,11 +176,11 @@ object CSS extends js.Any Select[String] .defaultValue(selectValue) .onChange((changedValue, _) => updateSelectValue(changedValue))( - Select.OptGroup.label("Manager")( + Select.OptGroup("Manager")( Select.Option("jack")("Jack"), Select.Option("lucy")("Lucy") ), - Select.OptGroup.label("Engineer")( + Select.OptGroup("Engineer")( Select.Option("yiminghe")("Yiminghe") ) ) @@ -202,7 +204,8 @@ object CSS extends js.Any Spin .size(antdStrings.large) .spinning(true)( - Alert(message = "Alert message title") + Alert + .message("Alert message title") .description("Further details about the context of this alert.") .`type`(antdStrings.info) .showIcon(true) @@ -282,13 +285,13 @@ object CSS extends js.Any .filterOption(true) // Filter options by input .defaultActiveFirstOption(true) // Make first option active - enter to select .optionsVarargs( - OptionData("Alphabet"), - OptionData("Baguette").set( + selectMod.DefaultOptionType("Alphabet"), + selectMod.DefaultOptionType("Baguette").set( "label", span(AntdIcon(ShopOutlinedIcon), " Baguette") ), // Set label as a ReactElement for customised display - OptionData("Bicycle"), - OptionData("Croissant") + selectMod.DefaultOptionType("Bicycle"), + selectMod.DefaultOptionType("Croissant") ) .onChange { case (text, _) => setText(text) } } @@ -410,7 +413,7 @@ object CSS extends js.Any val renderTooltip = section( h2("Tooltip"), - Tooltip.TooltipPropsWithTitleRefAttributes(title = ("Tooltip": ReactElement))(span("Hover me")) + Tooltip(TooltipPropsWithTitle("Tooltip": ReactElement).asInstanceOf[TooltipProps with RefAttributes[Any]])(span("Hover me")) ) val renderTimeline = section( @@ -433,15 +436,16 @@ object CSS extends js.Any val renderRangePicker = section( h2("Range Picker"), - DatePicker.PickerBaseProps.RangePicker - .RangePickerDateProps() - .showTime(RangeShowTimeObject[Moment].setFormat("HH:mm")) - .format("YYYY/MM/DD HH:mm") - .value(rangePickerValues) - .onChange { (values: RangeValue[Moment], formatString: js.Tuple2[String, String]) => + mod.DatePicker.RangePicker.create( + RangePickerDateProps[Moment]() + .setShowTime(RangeShowTimeObject[Moment].setFormat("HH:mm")) + .setFormat("YYYY/MM/DD HH:mm") + .setValue(rangePickerValues) + .setOnChange { (values: RangeValue[Moment], formatString: js.Tuple2[String, String]) => console.log(formatString) updateRangePickerValues(values) - }, + } + ), div(b("Note that moment.js date times are ready to be localized")), div(s"moment.js current locale: ${moment.apply().locale()}"), div(s"moment.js duration en_US: ${moment.apply().locale("en_US").fromNow()}"), @@ -453,9 +457,9 @@ object CSS extends js.Any val renderTreeSelect = section( h2("Multiple and checkable Tree Select"), { def node(title: String, value: String) = - DataNode().setTitle(title).setValue(value).setKey(value) + treeSelectMod.DefaultOptionType().setTitle(title).setValue(value).setKey(value) - val data: js.Array[DataNode] = js.Array( + val data: js.Array[treeSelectMod.DefaultOptionType] = js.Array( node("Node1", "0-0").setChildrenVarargs( node("Child Node1", "0-0-0") ), @@ -466,7 +470,7 @@ object CSS extends js.Any ) ) - TreeSelect[js.Array[String]] + TreeSelect[js.Array[String], treeSelectMod.DefaultOptionType]() .value(selectTreeValues) .onChange((values, _, _) => updateSelectTreeValues(values)) .treeData(data) diff --git a/antd/src/main/scala/demo/CoordinatedDemo.scala b/antd/src/main/scala/demo/CoordinatedDemo.scala index 6618fdf..b7621b1 100644 --- a/antd/src/main/scala/demo/CoordinatedDemo.scala +++ b/antd/src/main/scala/demo/CoordinatedDemo.scala @@ -46,8 +46,8 @@ object CoordinatedDemo { ) ) }( - Select.Option(value = "male")("Male"), - Select.Option(value = "female")("Female") + Select.Option.value("male")("Male"), + Select.Option.value("female")("Female") ) ), FormItem[Values]().wrapperCol(ColProps().setSpan(12).setOffset(5))( diff --git a/build.sbt b/build.sbt index 6f9d9ad..d1f547e 100644 --- a/build.sbt +++ b/build.sbt @@ -181,21 +181,70 @@ lazy val fixAntdAutoComplete = (dir: File) => { val input = IO.read(autoComplete) val output = input .replace( - "declare const Select: ((props: SelectProps & {", - "declare const Select: ((props: SelectProps & {", + """declare const RefAutoComplete: ((props: AutoCompleteProps & { + | children?: React.ReactNode; + |} & { + | ref?: React.Ref | undefined; + |}) => React.ReactElement) & { + | Option: import("rc-select/lib/Option").OptionFC; + |}; + |export default RefAutoComplete; + |""".stripMargin, + """declare const RefAutoComplete: ((props: AutoCompleteProps & { + | children?: React.ReactNode; + |} & { + | ref?: React.Ref | undefined; + |}) => React.ReactElement); + |declare type AutoCompleteWithOption = typeof RefAutoComplete & { + | Option: import("rc-select/lib/Option").OptionFC; + |}; + |declare const AutoComplete: AutoCompleteWithOption; + |export default AutoComplete; + |""".stripMargin ) IO.write(autoComplete, output) } lazy val fixAntdSelect = (dir: File) => { - val autoComplete = dir / "node_modules" / "antd" / "lib" / "select" / "index.d.ts" - val input = IO.read(autoComplete) + val select = dir / "node_modules" / "antd" / "lib" / "select" / "index.d.ts" + val input = IO.read(select) val output = input .replace( - "declare const RefAutoComplete: ((props: AutoCompleteProps & {", - "declare const RefAutoComplete: ((props: AutoCompleteProps & {" + """declare const Select: ((props: SelectProps & { + | children?: React.ReactNode; + |} & { + | ref?: React.Ref | undefined; + |}) => React.ReactElement) & { + | SECRET_COMBOBOX_MODE_DO_NOT_USE: string; + | Option: typeof Option; + | OptGroup: typeof OptGroup; + |};""".stripMargin, + """declare const SelectRef: ((props: SelectProps & { + | children?: React.ReactNode; + |} & { + | ref?: React.Ref | undefined; + |}) => React.ReactElement); + |declare type InternalSelectType = typeof SelectRef; + |interface SelectInterface extends InternalSelectType { + | SECRET_COMBOBOX_MODE_DO_NOT_USE: string; + | Option: typeof Option; + | OptGroup: typeof OptGroup; + |} + |declare const Select: SelectInterface; + |""".stripMargin ) - IO.write(autoComplete, output) + IO.write(select, output) +} + +lazy val fixAntdTooltip = (dir: File) => { + val tooltip = dir / "node_modules" / "antd" / "lib" / "tooltip" / "index.d.ts" + val input = IO.read(tooltip) + val output = input + .replace( + "export declare type TooltipProps = TooltipPropsWithTitle | TooltipPropsWithOverlay;", + "export declare type TooltipProps = TooltipPropsWithOverlay;" + ) + IO.write(tooltip, output) } /** From 69e959a19b561c7bc2171f4d85d7942ad08f0629 Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Thu, 4 Aug 2022 15:43:20 +1200 Subject: [PATCH 04/11] Fix remaining antd issues --- antd/src/main/scala/demo/App.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/antd/src/main/scala/demo/App.scala b/antd/src/main/scala/demo/App.scala index 93da388..82679d0 100644 --- a/antd/src/main/scala/demo/App.scala +++ b/antd/src/main/scala/demo/App.scala @@ -4,7 +4,9 @@ import slinky.core._ import slinky.core.annotations.react import slinky.core.facade.Hooks._ import slinky.core.facade.ReactElement +import slinky.web.html.*.tag import slinky.web.html._ +import typings.StBuildingComponent.Default import typings.antDesignIcons.components.AntdIcon import typings.antDesignIconsSvg.downOutlinedMod.{default => DownOutlinedIcon} import typings.antDesignIconsSvg.downloadOutlinedMod.{default => DownloadOutlinedIcon} @@ -434,10 +436,13 @@ object CSS extends js.Any ) ) + def RangePicker[DateType](props: RangePickerDateProps[DateType]) = + new Default[tag.type, mod.DatePicker.RangePicker](js.Array(mod.DatePicker.RangePicker, props)) + val renderRangePicker = section( h2("Range Picker"), - mod.DatePicker.RangePicker.create( - RangePickerDateProps[Moment]() + + RangePicker(RangePickerDateProps[Moment]() .setShowTime(RangeShowTimeObject[Moment].setFormat("HH:mm")) .setFormat("YYYY/MM/DD HH:mm") .setValue(rangePickerValues) From 9de34ef0e0073f6f54a62cc516ebc2a7eb2f2005 Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Thu, 4 Aug 2022 15:44:16 +1200 Subject: [PATCH 05/11] Remove project build.properties --- antd/project/build.properties | 1 - 1 file changed, 1 deletion(-) delete mode 100644 antd/project/build.properties diff --git a/antd/project/build.properties b/antd/project/build.properties deleted file mode 100644 index c8fcab5..0000000 --- a/antd/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.6.2 From 5b5580b746b3cef59edac813ae10e91e6a9a1f05 Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Thu, 4 Aug 2022 15:59:15 +1200 Subject: [PATCH 06/11] Add remote cache back in --- build.sbt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index d1f547e..b647c68 100644 --- a/build.sbt +++ b/build.sbt @@ -3,11 +3,11 @@ import java.nio.file.StandardCopyOption.REPLACE_EXISTING import scala.sys.process.Process -//Global / stRemoteCache := RemoteCache.S3Aws( -// bucket = "scalablytyped-demos", -// region = "eu-central-1", -// prefix = Some("st-cache") -//) +Global / stRemoteCache := RemoteCache.S3Aws( + bucket = "scalablytyped-demos", + region = "eu-central-1", + prefix = Some("st-cache") +) Global / onLoad := { println( From de73330872b8c47ff7953c14b35693f49b21bde8 Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Thu, 4 Aug 2022 15:59:57 +1200 Subject: [PATCH 07/11] Fix formatting --- build.sbt | 64 +++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/build.sbt b/build.sbt index b647c68..c8f4b90 100644 --- a/build.sbt +++ b/build.sbt @@ -10,8 +10,7 @@ Global / stRemoteCache := RemoteCache.S3Aws( ) Global / onLoad := { - println( - """* + println("""* |* Welcome to ScalablyTyped demos! |* |* These demos demonstrate how to use third party react components with Slinky. @@ -29,17 +28,17 @@ Global / onLoad := { //Global / stQuiet := true /** - * Custom task to start demo with webpack-dev-server, use as `/start`. - * Just `start` also works, and starts all frontend demos - * - * After that, the incantation is this to watch and compile on change: - * `~/fastOptJS::webpack` - */ + * Custom task to start demo with webpack-dev-server, use as `/start`. + * Just `start` also works, and starts all frontend demos + * + * After that, the incantation is this to watch and compile on change: + * `~/fastOptJS::webpack` + */ lazy val start = TaskKey[Unit]("start") /** Say just `dist` or `/dist` to make a production bundle in - * `docs` for github publishing - */ + * `docs` for github publishing + */ lazy val dist = TaskKey[File]("dist") lazy val baseSettings: Project => Project = @@ -123,8 +122,8 @@ lazy val `semantic-ui-react-kitchensink` = project ) /** Note: This can't use scalajs-bundler (at least I don't know how), - * so we run yarn ourselves with an external package.json. - */ + * so we run yarn ourselves with an external package.json. + */ lazy val `storybook-react` = project .enablePlugins(ScalablyTypedConverterExternalNpmPlugin) .configure(baseSettings) @@ -138,10 +137,9 @@ lazy val `storybook-react` = project baseDirectory.value }, stFlavour := Flavour.Slinky, - /** This is not suitable for development, but effective for demo. - * Run `yarn storybook` commands yourself, and run `~storybook-react/fastOptJS` from sbt - */ + * Run `yarn storybook` commands yourself, and run `~storybook-react/fastOptJS` from sbt + */ start := { (Compile / fastOptJS).value if (scala.util.Properties.isWin) Process("yarn storybook", baseDirectory.value).run() @@ -248,8 +246,8 @@ lazy val fixAntdTooltip = (dir: File) => { } /** - * Alias to launch material-ui in dev mode, recompiling on changes - */ + * Alias to launch material-ui in dev mode, recompiling on changes + */ addCommandAlias( "react-router-dom-dev", ";react-router-dom/fastOptJS::startWebpackDevServer;~react-router-dom/fastOptJS" @@ -269,8 +267,8 @@ lazy val `react-router-dom` = ) /** - * Alias to launch material-ui in dev mode, recompiling on changes - */ + * Alias to launch material-ui in dev mode, recompiling on changes + */ addCommandAlias("materialUiDev", ";material-ui/fastOptJS::startWebpackDevServer;~material-ui/fastOptJS") lazy val `material-ui` = project @@ -380,8 +378,8 @@ lazy val `react-select` = project stFlavour := Flavour.Slinky, Compile / npmDependencies ++= Seq( "@types/react-select" -> "3.0.22", - "react-select" -> "3.1.0", - ), + "react-select" -> "3.1.0" + ) ) lazy val monaco = project @@ -395,7 +393,7 @@ lazy val monaco = project "react-monaco-editor" -> "0.40.0" ), /* custom webpack file to include css */ - webpackConfigFile := Some((baseDirectory).value / "custom.webpack.config.js"), + webpackConfigFile := Some(baseDirectory.value / "custom.webpack.config.js"), Compile / npmDevDependencies ++= Seq( "webpack-merge" -> "4.2.2", "css-loader" -> "3.4.2", @@ -415,8 +413,8 @@ lazy val plotly = project Compile / npmDependencies ++= Seq( "plotly.js" -> "1.57.1", "react-plotly.js" -> "2.5.0", - "@types/react-plotly.js" -> "2.2.4", - ), + "@types/react-plotly.js" -> "2.2.4" + ) ) lazy val cytoscape = project @@ -430,8 +428,8 @@ lazy val cytoscape = project "cytoscape" -> "3.18.1", "react-cytoscapejs" -> "1.2.1", "@types/cytoscape" -> "3.14.12", - "@types/react-cytoscapejs" -> "1.2.0", - ), + "@types/react-cytoscapejs" -> "1.2.0" + ) ) lazy val gojs = project @@ -443,13 +441,13 @@ lazy val gojs = project stFlavour := Flavour.Slinky, Compile / npmDependencies ++= Seq( "gojs" -> "2.1.38", - "gojs-react" -> "1.0.10", + "gojs-react" -> "1.0.10" ) ) /** Note: This can't use scalajs-bundler (at least I don't know how), - * so we run yarn ourselves with an external package.json. - */ + * so we run yarn ourselves with an external package.json. + */ lazy val `react-native` = project .enablePlugins(ScalablyTypedConverterExternalNpmPlugin) .configure(baseSettings) @@ -505,9 +503,9 @@ lazy val withCssLoading: Project => Project = ) /** - * Implement the `start` and `dist` tasks defined above. - * Most of this is really just to copy the index.html file around. - */ + * Implement the `start` and `dist` tasks defined above. + * Most of this is really just to copy the index.html file around. + */ lazy val browserProject: Project => Project = _.settings( start := { @@ -521,7 +519,7 @@ lazy val browserProject: Project => Project = distFolder.mkdirs() artifacts.foreach { artifact => val target = artifact.data.relativeTo(artifactFolder) match { - case None => distFolder / artifact.data.name + case None => distFolder / artifact.data.name case Some(relFile) => distFolder / relFile.toString } From 9f8289c6be6385b52df0f56292e38bf404ef136f Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Thu, 4 Aug 2022 16:00:33 +1200 Subject: [PATCH 08/11] Fix formatting --- antd/src/main/scala/demo/App.scala | 37 ++++++++++++++++-------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/antd/src/main/scala/demo/App.scala b/antd/src/main/scala/demo/App.scala index 82679d0..7c16457 100644 --- a/antd/src/main/scala/demo/App.scala +++ b/antd/src/main/scala/demo/App.scala @@ -15,11 +15,10 @@ import typings.antDesignIconsSvg.lockTwoToneMod.{default => LockTwoToneIcon} import typings.antDesignIconsSvg.mailTwoToneMod.{default => MailTwoToneIcon} import typings.antDesignIconsSvg.shopOutlinedMod.{default => ShopOutlinedIcon} import typings.antDesignIconsSvg.userOutlinedMod.{default => UserOutlinedIcon} -import typings.antd.antdStrings -import typings.antd.components.{List => AntList, _} import typings.antd.components.Form.{Form => FormItem} +import typings.antd.components.{List => AntList, _} import typings.antd.generatePickerMod.RangePickerDateProps -import typings.antd.mod +import typings.antd.{antdStrings, mod} import typings.antd.notificationMod.{ArgsProps, IconType, default => Notification} import typings.antd.tableInterfaceMod.{ColumnGroupType, ColumnType} import typings.antd.tooltipMod.{TooltipProps, TooltipPropsWithTitle} @@ -288,10 +287,12 @@ object CSS extends js.Any .defaultActiveFirstOption(true) // Make first option active - enter to select .optionsVarargs( selectMod.DefaultOptionType("Alphabet"), - selectMod.DefaultOptionType("Baguette").set( - "label", - span(AntdIcon(ShopOutlinedIcon), " Baguette") - ), // Set label as a ReactElement for customised display + selectMod + .DefaultOptionType("Baguette") + .set( + "label", + span(AntdIcon(ShopOutlinedIcon), " Baguette") + ), // Set label as a ReactElement for customised display selectMod.DefaultOptionType("Bicycle"), selectMod.DefaultOptionType("Croissant") ) @@ -415,7 +416,9 @@ object CSS extends js.Any val renderTooltip = section( h2("Tooltip"), - Tooltip(TooltipPropsWithTitle("Tooltip": ReactElement).asInstanceOf[TooltipProps with RefAttributes[Any]])(span("Hover me")) + Tooltip(TooltipPropsWithTitle("Tooltip": ReactElement).asInstanceOf[TooltipProps with RefAttributes[Any]])( + span("Hover me") + ) ) val renderTimeline = section( @@ -441,15 +444,15 @@ object CSS extends js.Any val renderRangePicker = section( h2("Range Picker"), - - RangePicker(RangePickerDateProps[Moment]() - .setShowTime(RangeShowTimeObject[Moment].setFormat("HH:mm")) - .setFormat("YYYY/MM/DD HH:mm") - .setValue(rangePickerValues) - .setOnChange { (values: RangeValue[Moment], formatString: js.Tuple2[String, String]) => - console.log(formatString) - updateRangePickerValues(values) - } + RangePicker( + RangePickerDateProps[Moment]() + .setShowTime(RangeShowTimeObject[Moment].setFormat("HH:mm")) + .setFormat("YYYY/MM/DD HH:mm") + .setValue(rangePickerValues) + .setOnChange { (values: RangeValue[Moment], formatString: js.Tuple2[String, String]) => + console.log(formatString) + updateRangePickerValues(values) + } ), div(b("Note that moment.js date times are ready to be localized")), div(s"moment.js current locale: ${moment.apply().locale()}"), From 8131512c71e5b317e9f85b45b562b37c1a97732b Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Thu, 4 Aug 2022 16:02:09 +1200 Subject: [PATCH 09/11] Remove unused fixeruperer --- build.sbt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/build.sbt b/build.sbt index c8f4b90..a5bf67d 100644 --- a/build.sbt +++ b/build.sbt @@ -234,17 +234,6 @@ lazy val fixAntdSelect = (dir: File) => { IO.write(select, output) } -lazy val fixAntdTooltip = (dir: File) => { - val tooltip = dir / "node_modules" / "antd" / "lib" / "tooltip" / "index.d.ts" - val input = IO.read(tooltip) - val output = input - .replace( - "export declare type TooltipProps = TooltipPropsWithTitle | TooltipPropsWithOverlay;", - "export declare type TooltipProps = TooltipPropsWithOverlay;" - ) - IO.write(tooltip, output) -} - /** * Alias to launch material-ui in dev mode, recompiling on changes */ From 4477a9880b07f87e4d95eef2916bda3263ae8b24 Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Thu, 4 Aug 2022 16:03:36 +1200 Subject: [PATCH 10/11] Add comment --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a5bf67d..3810e4f 100644 --- a/build.sbt +++ b/build.sbt @@ -165,9 +165,9 @@ lazy val antd = // Workaround for https://github.com/ScalablyTyped/Converter/issues/467 stIgnore += "rc-tree", Compile / npmDependencies ++= Seq("antd" -> "4.22.3"), - //Compile / npmDependencies ++= Seq("antd" -> "4.9.4"), Compile / npmInstallDependencies := Def.task { val dir = (Compile / npmInstallDependencies).value + // Workarounds for https://github.com/ScalablyTyped/Converter/issues/468 fixAntdAutoComplete(dir) fixAntdSelect(dir) dir From b434bead6f20e25ca9cdd8d1253856cd9cf289b9 Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Thu, 4 Aug 2022 16:05:24 +1200 Subject: [PATCH 11/11] Add comment --- antd/src/main/scala/demo/App.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/antd/src/main/scala/demo/App.scala b/antd/src/main/scala/demo/App.scala index 7c16457..e6d8d50 100644 --- a/antd/src/main/scala/demo/App.scala +++ b/antd/src/main/scala/demo/App.scala @@ -439,6 +439,7 @@ object CSS extends js.Any ) ) + // Workaround for https://github.com/ScalablyTyped/Converter/issues/470 def RangePicker[DateType](props: RangePickerDateProps[DateType]) = new Default[tag.type, mod.DatePicker.RangePicker](js.Array(mod.DatePicker.RangePicker, props))