From 4dff2b75c954c3cb24043fbe857ada0444f5a580 Mon Sep 17 00:00:00 2001 From: Priscila Oliveira Date: Sun, 20 Jan 2019 11:58:02 +0100 Subject: [PATCH 1/3] chore: updated material ui --- package.json | 6 +- yarn.lock | 259 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 160 insertions(+), 105 deletions(-) diff --git a/package.json b/package.json index 71e0b91b2..d8a30833d 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,8 @@ "verdaccio": "./bin/verdaccio" }, "dependencies": { + "@material-ui/styles": "3.0.0-alpha.8", + "@material-ui/system": "3.0.0-alpha.1", "@verdaccio/file-locking": "0.0.7", "@verdaccio/local-storage": "1.2.0", "@verdaccio/streams": "1.0.0", @@ -76,8 +78,8 @@ "@babel/runtime": "^7.2.0", "@commitlint/cli": "7.2.1", "@commitlint/config-conventional": "7.1.2", - "@material-ui/core": "3.1.0", - "@material-ui/icons": "3.0.1", + "@material-ui/core": "3.9.0", + "@material-ui/icons": "3.0.2", "@verdaccio/types": "4.1.3", "autosuggest-highlight": "3.1.1", "babel-core": "7.0.0-bridge.0", diff --git a/yarn.lock b/yarn.lock index 6d3b519fa..b219e6bbf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -808,10 +808,10 @@ pirates "^4.0.0" source-map-support "^0.5.9" -"@babel/runtime@7.0.0": - version "7.0.0" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c" - integrity sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA== +"@babel/runtime@7.1.2": + version "7.1.2" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.2.tgz#81c89935f4647706fc54541145e6b4ecfef4b8e3" + integrity sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg== dependencies: regenerator-runtime "^0.12.0" @@ -1011,6 +1011,11 @@ resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44" integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ== +"@emotion/hash@^0.7.1": + version "0.7.1" + resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.1.tgz#9833722341379fb7d67f06a4b00ab3c37913da53" + integrity sha512-OYpa/Sg+2GDX+jibUfpZVn1YqSVRpYmTLF2eyAfrFTIJSbwyIrc+YscayoykvaOME/wV4BV0Sa0yqdMrgse6mA== + "@emotion/is-prop-valid@^0.6.1": version "0.6.8" resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz#68ad02831da41213a2089d2cab4e8ac8b30cbd85" @@ -1057,23 +1062,25 @@ mkdirp "^0.5.1" rimraf "^2.5.2" -"@material-ui/core@3.1.0": - version "3.1.0" - resolved "https://registry.npmjs.org/@material-ui/core/-/core-3.1.0.tgz#40c70e0764ef27dca5e149551577eba10c2e79ce" - integrity sha512-Tq9xO1CsaPq+TGQtMz7B0Hs2Wz9Sf2W8C9ydcZT8cP1ud9cuZZ/2izRvqNZEp1fCaL5+8K0DJvuu8Di98kNuJw== +"@material-ui/core@3.9.0": + version "3.9.0" + resolved "https://registry.npmjs.org/@material-ui/core/-/core-3.9.0.tgz#7e74cf1979ee65f9fd388145764b3e58f48da6c6" + integrity sha512-9fxu0B9zx/TfiU0OJmwRFk+I+2J7fcXzTfQl+ZPxqlVRrPDqTHnMZlqWRJjlHCe3AVXlgpJ6/a4QCvGEohEbIQ== dependencies: - "@babel/runtime" "7.0.0" - "@types/jss" "^9.5.3" + "@babel/runtime" "^7.2.0" + "@material-ui/system" "^3.0.0-alpha.0" + "@material-ui/utils" "^3.0.0-alpha.2" + "@types/jss" "^9.5.6" "@types/react-transition-group" "^2.0.8" brcast "^3.0.1" classnames "^2.2.5" csstype "^2.5.2" debounce "^1.1.0" - deepmerge "^2.0.1" + deepmerge "^3.0.0" dom-helpers "^3.2.1" - hoist-non-react-statics "^2.5.0" + hoist-non-react-statics "^3.2.1" is-plain-object "^2.0.4" - jss "^9.3.3" + jss "^9.8.7" jss-camel-case "^6.0.0" jss-default-unit "^8.0.2" jss-global "^3.0.0" @@ -1085,18 +1092,58 @@ popper.js "^1.14.1" prop-types "^15.6.0" react-event-listener "^0.6.2" - react-jss "^8.1.0" react-transition-group "^2.2.1" recompose "0.28.0 - 0.30.0" warning "^4.0.1" -"@material-ui/icons@3.0.1": - version "3.0.1" - resolved "https://registry.npmjs.org/@material-ui/icons/-/icons-3.0.1.tgz#671fb3d04dcaf9351dbbd2bf82ae2ae72e3d93cd" - integrity sha512-1kNcxYiIT1x8iDPEAlgmKrfRTIV8UyK6fLVcZ9kMHIKGWft9I451V5mvSrbCjbf7MX1TbLWzZjph0aVCRf9MqQ== +"@material-ui/icons@3.0.2": + version "3.0.2" + resolved "https://registry.npmjs.org/@material-ui/icons/-/icons-3.0.2.tgz#d67a6dd1ec8312d3a88ec97944a63daeef24fe10" + integrity sha512-QY/3gJnObZQ3O/e6WjH+0ah2M3MOgLOzCy8HTUoUx9B6dDrS18vP7Ycw3qrDEKlB6q1KNxy6CZHm5FCauWGy2g== dependencies: - "@babel/runtime" "7.0.0" - recompose "^0.29.0" + "@babel/runtime" "^7.2.0" + recompose "0.28.0 - 0.30.0" + +"@material-ui/styles@3.0.0-alpha.8": + version "3.0.0-alpha.8" + resolved "https://registry.npmjs.org/@material-ui/styles/-/styles-3.0.0-alpha.8.tgz#14c5680e09b37ebedb26e8a6593aa8afe9fbb15c" + integrity sha512-66X0fN9AmXexpnk8wWin2L0p4PzRvIP8Cy2pzXANrbfpHyTgDsURiGECRgv+cgtIBoAjqb/x+NxEE92RYFYFWQ== + dependencies: + "@babel/runtime" "^7.2.0" + "@emotion/hash" "^0.7.1" + "@material-ui/utils" "^3.0.0-alpha.2" + classnames "^2.2.5" + deepmerge "^3.0.0" + hoist-non-react-statics "^3.2.1" + jss "^10.0.0-alpha.7" + jss-plugin-camel-case "^10.0.0-alpha.7" + jss-plugin-default-unit "^10.0.0-alpha.7" + jss-plugin-global "^10.0.0-alpha.7" + jss-plugin-nested "^10.0.0-alpha.7" + jss-plugin-props-sort "^10.0.0-alpha.7" + jss-plugin-rule-value-function "^10.0.0-alpha.7" + jss-plugin-vendor-prefixer "^10.0.0-alpha.7" + prop-types "^15.6.0" + warning "^4.0.1" + +"@material-ui/system@3.0.0-alpha.1", "@material-ui/system@^3.0.0-alpha.0": + version "3.0.0-alpha.1" + resolved "https://registry.npmjs.org/@material-ui/system/-/system-3.0.0-alpha.1.tgz#9309e79a88dc069323b4adbf42e844a2facaf93b" + integrity sha512-5EihYa6Ct5mA/shfFSjWO8e/whV+otbXAduYfiL34GH+Mh4vZs+wjcy0P80XA/cDIwSgkQ7vTvvY1x04AgIz4w== + dependencies: + "@babel/runtime" "7.1.2" + deepmerge "^2.0.1" + prop-types "^15.6.0" + warning "^4.0.1" + +"@material-ui/utils@^3.0.0-alpha.2": + version "3.0.0-alpha.3" + resolved "https://registry.npmjs.org/@material-ui/utils/-/utils-3.0.0-alpha.3.tgz#836c62ea46f5ffc6f0b5ea05ab814704a86908b1" + integrity sha512-rwMdMZptX0DivkqBuC+Jdq7BYTXwqKai5G5ejPpuEDKpWzi1Oxp+LygGw329FrKpuKeiqpcymlqJTjmy+quWng== + dependencies: + "@babel/runtime" "^7.2.0" + prop-types "^15.6.0" + react-is "^16.6.3" "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -1118,7 +1165,7 @@ dependencies: any-observable "^0.3.0" -"@types/jss@^9.5.3": +"@types/jss@^9.5.6": version "9.5.7" resolved "https://registry.npmjs.org/@types/jss/-/jss-9.5.7.tgz#fa57a6d0b38a3abef8a425e3eb6a53495cb9d5a0" integrity sha512-OZimStu2QdDMtZ0h72JXqvLVbWUjXd5ZLk8vxLmfuC/nM1AabRyyGoxSufnzixrbpEcVcyy/JV5qeQu2JnjVZw== @@ -3564,6 +3611,13 @@ css-vendor@^0.3.8: dependencies: is-in-browser "^1.0.2" +css-vendor@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/css-vendor/-/css-vendor-1.1.0.tgz#39bc1bb46b633528a9041ad5e107ddd353240388" + integrity sha512-pePyROdjdMRjHhGN+xZjBomaR9GXueNQ2ZLkEi0i2A/eVx0m4oCLglltdRsaYCSOpun0GRJWuqmWLIYj6Y/RVQ== + dependencies: + is-in-browser "^1.0.2" + css-what@2.1, css-what@^2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d" @@ -3894,6 +3948,11 @@ deepmerge@^2.0.1: resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170" integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA== +deepmerge@^3.0.0: + version "3.1.0" + resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-3.1.0.tgz#a612626ce4803da410d77554bfd80361599c034d" + integrity sha512-/TnecbwXEdycfbsM2++O3eGiatEFHjjNciHEwJclM+T5Kd94qD1AP+2elP/Mq0L5b9VZJao5znR01Mz6eX8Seg== + default-gateway@^2.6.0: version "2.7.2" resolved "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f" @@ -5878,6 +5937,13 @@ hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0: resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw== +hoist-non-react-statics@^3.2.1: + version "3.2.1" + resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz#c09c0555c84b38a7ede6912b61efddafd6e75e1e" + integrity sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw== + dependencies: + react-is "^16.3.2" + home-or-tmp@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" @@ -6550,11 +6616,6 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= -is-function@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5" - integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU= - is-generator-fn@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a" @@ -7390,37 +7451,18 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jss-camel-case@^6.0.0, jss-camel-case@^6.1.0: +jss-camel-case@^6.0.0: version "6.1.0" resolved "https://registry.npmjs.org/jss-camel-case/-/jss-camel-case-6.1.0.tgz#ccb1ff8d6c701c02a1fed6fb6fb6b7896e11ce44" integrity sha512-HPF2Q7wmNW1t79mCqSeU2vdd/vFFGpkazwvfHMOhPlMgXrJDzdj9viA2SaHk9ZbD5pfL63a8ylp4++irYbbzMQ== dependencies: hyphenate-style-name "^1.0.2" -jss-compose@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/jss-compose/-/jss-compose-5.0.0.tgz#ce01b2e4521d65c37ea42cf49116e5f7ab596484" - integrity sha512-YofRYuiA0+VbeOw0VjgkyO380sA4+TWDrW52nSluD9n+1FWOlDzNbgpZ/Sb3Y46+DcAbOS21W5jo6SAqUEiuwA== - dependencies: - warning "^3.0.0" - jss-default-unit@^8.0.2: version "8.0.2" resolved "https://registry.npmjs.org/jss-default-unit/-/jss-default-unit-8.0.2.tgz#cc1e889bae4c0b9419327b314ab1c8e2826890e6" integrity sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg== -jss-expand@^5.3.0: - version "5.3.0" - resolved "https://registry.npmjs.org/jss-expand/-/jss-expand-5.3.0.tgz#02be076efe650125c842f5bb6fb68786fe441ed6" - integrity sha512-NiM4TbDVE0ykXSAw6dfFmB1LIqXP/jdd0ZMnlvlGgEMkMt+weJIl8Ynq1DsuBY9WwkNyzWktdqcEW2VN0RAtQg== - -jss-extend@^6.2.0: - version "6.2.0" - resolved "https://registry.npmjs.org/jss-extend/-/jss-extend-6.2.0.tgz#4af09d0b72fb98ee229970f8ca852fec1ca2a8dc" - integrity sha512-YszrmcB6o9HOsKPszK7NeDBNNjVyiW864jfoiHoMlgMIg2qlxKw70axZHqgczXHDcoyi/0/ikP1XaHDPRvYtEA== - dependencies: - warning "^3.0.0" - jss-global@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/jss-global/-/jss-global-3.0.0.tgz#e19e5c91ab2b96353c227e30aa2cbd938cdaafa2" @@ -7433,34 +7475,63 @@ jss-nested@^6.0.1: dependencies: warning "^3.0.0" -jss-preset-default@^4.3.0: - version "4.5.0" - resolved "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-4.5.0.tgz#d3a457012ccd7a551312014e394c23c4b301cadd" - integrity sha512-qZbpRVtHT7hBPpZEBPFfafZKWmq3tA/An5RNqywDsZQGrlinIF/mGD9lmj6jGqu8GrED2SMHZ3pPKLmjCZoiaQ== +jss-plugin-camel-case@^10.0.0-alpha.7: + version "10.0.0-alpha.7" + resolved "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0-alpha.7.tgz#7dcbd9acb6682f3102cb2d3356b4fd9642d93f17" + integrity sha512-Bwrav1ZB0XywdJW6TaEuFhKe1ZpZvUlESh3jsFOvebA9aFTYNCkmHMEqjA5+u9VMxksl3u77nnZHtukpxkzrBA== dependencies: - jss-camel-case "^6.1.0" - jss-compose "^5.0.0" - jss-default-unit "^8.0.2" - jss-expand "^5.3.0" - jss-extend "^6.2.0" - jss-global "^3.0.0" - jss-nested "^6.0.1" - jss-props-sort "^6.0.0" - jss-template "^1.0.1" - jss-vendor-prefixer "^7.0.0" + "@babel/runtime" "^7.0.0" + hyphenate-style-name "^1.0.2" + +jss-plugin-default-unit@^10.0.0-alpha.7: + version "10.0.0-alpha.7" + resolved "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0-alpha.7.tgz#f6dd0a03d545e7bf243c062bae3a832ac8c5ff6d" + integrity sha512-auuJUbQaWMxoHOVFPrfZNZpZm9ab8PZeDyvey8nMt2lbokkmZ53UyAnM/1kNsg5BdAXTItcLDxDB3I4gwNU84g== + dependencies: + "@babel/runtime" "^7.0.0" + +jss-plugin-global@^10.0.0-alpha.7: + version "10.0.0-alpha.7" + resolved "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.0.0-alpha.7.tgz#38ca390802b62da490afbaafc581552a81977729" + integrity sha512-OWeoW4szLDgRUKviST+xfilqa8O5uXJCW+O3YonheCRTRJg6rRzlE/b5pfYPoU9UtwvY9n7JvwBX5r3c1lMsEQ== + dependencies: + "@babel/runtime" "^7.0.0" + +jss-plugin-nested@^10.0.0-alpha.7: + version "10.0.0-alpha.7" + resolved "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.0.0-alpha.7.tgz#03a89c8f7c1d570a3d5f16dae3e61f7f2edb0316" + integrity sha512-wsRzuIZXAc6WMjc61mREW9cUrDxgSI7dK/fx5c7a06IDUfSn+83NJ30J/RB4oBnbQW9SijV/muujz7IJqpn9Gw== + dependencies: + "@babel/runtime" "^7.0.0" + tiny-warning "^1.0.2" + +jss-plugin-props-sort@^10.0.0-alpha.7: + version "10.0.0-alpha.7" + resolved "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0-alpha.7.tgz#46f1809fcae0acc048d0047aa54a4b9b6973597d" + integrity sha512-KXOCaHUk1+KXqE0z3q66/w1fDoy+VsZvI77gLxOqTsTrvIKFLX0jarwXogW3CDlaPQQFTZ6JykJJXtPRTBlstA== + dependencies: + "@babel/runtime" "^7.0.0" + +jss-plugin-rule-value-function@^10.0.0-alpha.7: + version "10.0.0-alpha.7" + resolved "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0-alpha.7.tgz#63df1078ac361dda67996e25291d90f7226ae59a" + integrity sha512-ett83hvIM69/LknmrWndrrdiDlfLfP+rneU5qP7gTOWJ7g1P9GuEL1Tc4CWdZUWBX+T58tgIBP0V1pzWCkP0QA== + dependencies: + "@babel/runtime" "^7.0.0" + +jss-plugin-vendor-prefixer@^10.0.0-alpha.7: + version "10.0.0-alpha.7" + resolved "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0-alpha.7.tgz#caa34eb0bc39f0c98f425e174fc220d1f1a8760a" + integrity sha512-YbIVgqq+dLimOBOEYggho1Iuc0roz4PJSZYyaok9n8JnXVIqPnxYJbr8+bMbvzJ5CL3eeJij/e7L2IPCceRKrA== + dependencies: + "@babel/runtime" "^7.0.0" + css-vendor "^1.1.0" jss-props-sort@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz#9105101a3b5071fab61e2d85ea74cc22e9b16323" integrity sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g== -jss-template@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/jss-template/-/jss-template-1.0.1.tgz#09aed9d86cc547b07f53ef355d7e1777f7da430a" - integrity sha512-m5BqEWha17fmIVXm1z8xbJhY6GFJxNB9H68GVnCWPyGYfxiAgY9WTQyvDAVj+pYRgrXSOfN5V1T4+SzN1sJTeg== - dependencies: - warning "^3.0.0" - jss-vendor-prefixer@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz#0166729650015ef19d9f02437c73667231605c71" @@ -7468,7 +7539,17 @@ jss-vendor-prefixer@^7.0.0: dependencies: css-vendor "^0.3.8" -jss@^9.3.3, jss@^9.7.0: +jss@^10.0.0-alpha.7: + version "10.0.0-alpha.8" + resolved "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.8.tgz#7bf6232046e131c8bb6edafd01d13beab06db0da" + integrity sha512-7cNQXMbJ5KQOgTJSaDPfLInBIaU5AD+FYg00PCl9i170NXj3M/CsoIWUMnTGbsWjcIQ7DmlqzrSFdsxSwzHjuA== + dependencies: + "@babel/runtime" "^7.0.0" + is-in-browser "^1.1.3" + symbol-observable "^1.2.0" + tiny-warning "^1.0.2" + +jss@^9.8.7: version "9.8.7" resolved "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz#ed9763fc0f2f0260fc8260dac657af61e622ce05" integrity sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ== @@ -10612,22 +10693,11 @@ react-hot-loader@4.2.0: react-lifecycles-compat "^3.0.4" shallowequal "^1.0.2" -react-is@^16.4.2, react-is@^16.7.0: +react-is@^16.3.2, react-is@^16.4.2, react-is@^16.6.3, react-is@^16.7.0: version "16.7.0" resolved "https://registry.npmjs.org/react-is/-/react-is-16.7.0.tgz#c1bd21c64f1f1364c6f70695ec02d69392f41bfa" integrity sha512-Z0VRQdF4NPDoI0tsXVMLkJLiwEBa+RP66g0xDHxgxysxSoCUccSten4RTF/UFvZF1dZvZ9Zu1sx+MDXwcOR34g== -react-jss@^8.1.0: - version "8.6.1" - resolved "https://registry.npmjs.org/react-jss/-/react-jss-8.6.1.tgz#a06e2e1d2c4d91b4d11befda865e6c07fbd75252" - integrity sha512-SH6XrJDJkAphp602J14JTy3puB2Zxz1FkM3bKVE8wON+va99jnUTKWnzGECb3NfIn9JPR5vHykge7K3/A747xQ== - dependencies: - hoist-non-react-statics "^2.5.0" - jss "^9.7.0" - jss-preset-default "^4.3.0" - prop-types "^15.6.0" - theming "^1.3.0" - react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" @@ -10806,18 +10876,6 @@ realpath-native@^1.0.0: react-lifecycles-compat "^3.0.2" symbol-observable "^1.0.4" -recompose@^0.29.0: - version "0.29.0" - resolved "https://registry.npmjs.org/recompose/-/recompose-0.29.0.tgz#f1a4e20d5f24d6ef1440f83924e821de0b1bccef" - integrity sha512-J/qLXNU4W+AeHCDR70ajW8eMd1uroqZaECTj6qqDLPMILz3y0EzpYlvrnxKB9DnqcngWrtGwjXY9JeXaW9kS1A== - dependencies: - "@babel/runtime" "^7.0.0" - change-emitter "^0.1.2" - fbjs "^0.8.1" - hoist-non-react-statics "^2.3.1" - react-lifecycles-compat "^3.0.2" - symbol-observable "^1.0.4" - redent@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" @@ -12347,7 +12405,7 @@ svgo@^1.0.0: unquote "~1.1.1" util.promisify "~1.0.0" -symbol-observable@1.2.0, symbol-observable@^1.0.4, symbol-observable@^1.1.0: +symbol-observable@1.2.0, symbol-observable@^1.0.4, symbol-observable@^1.1.0, symbol-observable@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== @@ -12438,16 +12496,6 @@ text-table@^0.2.0: resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -theming@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/theming/-/theming-1.3.0.tgz#286d5bae80be890d0adc645e5ca0498723725bdc" - integrity sha512-ya5Ef7XDGbTPBv5ENTwrwkPUexrlPeiAg/EI9kdlUAZhNlRbCdhMKRgjNX1IcmsmiPcqDQZE6BpSaH+cr31FKw== - dependencies: - brcast "^3.0.1" - is-function "^1.0.1" - is-plain-object "^2.0.1" - prop-types "^15.5.8" - throat@^4.0.0: version "4.1.0" resolved "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" @@ -12483,6 +12531,11 @@ timsort@^0.3.0: resolved "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= +tiny-warning@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.2.tgz#1dfae771ee1a04396bdfde27a3adcebc6b648b28" + integrity sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q== + tmp@^0.0.33: version "0.0.33" resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" From 3c541df8e15e5c0e7f4cc7b18028623c90d6aab3 Mon Sep 17 00:00:00 2001 From: Priscila Oliveira Date: Sun, 20 Jan 2019 12:01:29 +0100 Subject: [PATCH 2/3] refactor: removed material ui alpha styles/system --- package.json | 2 - yarn.lock | 105 +-------------------------------------------------- 2 files changed, 2 insertions(+), 105 deletions(-) diff --git a/package.json b/package.json index d8a30833d..6d18fc824 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,6 @@ "verdaccio": "./bin/verdaccio" }, "dependencies": { - "@material-ui/styles": "3.0.0-alpha.8", - "@material-ui/system": "3.0.0-alpha.1", "@verdaccio/file-locking": "0.0.7", "@verdaccio/local-storage": "1.2.0", "@verdaccio/streams": "1.0.0", diff --git a/yarn.lock b/yarn.lock index b219e6bbf..b6e7495a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1011,11 +1011,6 @@ resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44" integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ== -"@emotion/hash@^0.7.1": - version "0.7.1" - resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.1.tgz#9833722341379fb7d67f06a4b00ab3c37913da53" - integrity sha512-OYpa/Sg+2GDX+jibUfpZVn1YqSVRpYmTLF2eyAfrFTIJSbwyIrc+YscayoykvaOME/wV4BV0Sa0yqdMrgse6mA== - "@emotion/is-prop-valid@^0.6.1": version "0.6.8" resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz#68ad02831da41213a2089d2cab4e8ac8b30cbd85" @@ -1104,29 +1099,7 @@ "@babel/runtime" "^7.2.0" recompose "0.28.0 - 0.30.0" -"@material-ui/styles@3.0.0-alpha.8": - version "3.0.0-alpha.8" - resolved "https://registry.npmjs.org/@material-ui/styles/-/styles-3.0.0-alpha.8.tgz#14c5680e09b37ebedb26e8a6593aa8afe9fbb15c" - integrity sha512-66X0fN9AmXexpnk8wWin2L0p4PzRvIP8Cy2pzXANrbfpHyTgDsURiGECRgv+cgtIBoAjqb/x+NxEE92RYFYFWQ== - dependencies: - "@babel/runtime" "^7.2.0" - "@emotion/hash" "^0.7.1" - "@material-ui/utils" "^3.0.0-alpha.2" - classnames "^2.2.5" - deepmerge "^3.0.0" - hoist-non-react-statics "^3.2.1" - jss "^10.0.0-alpha.7" - jss-plugin-camel-case "^10.0.0-alpha.7" - jss-plugin-default-unit "^10.0.0-alpha.7" - jss-plugin-global "^10.0.0-alpha.7" - jss-plugin-nested "^10.0.0-alpha.7" - jss-plugin-props-sort "^10.0.0-alpha.7" - jss-plugin-rule-value-function "^10.0.0-alpha.7" - jss-plugin-vendor-prefixer "^10.0.0-alpha.7" - prop-types "^15.6.0" - warning "^4.0.1" - -"@material-ui/system@3.0.0-alpha.1", "@material-ui/system@^3.0.0-alpha.0": +"@material-ui/system@^3.0.0-alpha.0": version "3.0.0-alpha.1" resolved "https://registry.npmjs.org/@material-ui/system/-/system-3.0.0-alpha.1.tgz#9309e79a88dc069323b4adbf42e844a2facaf93b" integrity sha512-5EihYa6Ct5mA/shfFSjWO8e/whV+otbXAduYfiL34GH+Mh4vZs+wjcy0P80XA/cDIwSgkQ7vTvvY1x04AgIz4w== @@ -3611,13 +3584,6 @@ css-vendor@^0.3.8: dependencies: is-in-browser "^1.0.2" -css-vendor@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/css-vendor/-/css-vendor-1.1.0.tgz#39bc1bb46b633528a9041ad5e107ddd353240388" - integrity sha512-pePyROdjdMRjHhGN+xZjBomaR9GXueNQ2ZLkEi0i2A/eVx0m4oCLglltdRsaYCSOpun0GRJWuqmWLIYj6Y/RVQ== - dependencies: - is-in-browser "^1.0.2" - css-what@2.1, css-what@^2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d" @@ -7475,58 +7441,6 @@ jss-nested@^6.0.1: dependencies: warning "^3.0.0" -jss-plugin-camel-case@^10.0.0-alpha.7: - version "10.0.0-alpha.7" - resolved "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0-alpha.7.tgz#7dcbd9acb6682f3102cb2d3356b4fd9642d93f17" - integrity sha512-Bwrav1ZB0XywdJW6TaEuFhKe1ZpZvUlESh3jsFOvebA9aFTYNCkmHMEqjA5+u9VMxksl3u77nnZHtukpxkzrBA== - dependencies: - "@babel/runtime" "^7.0.0" - hyphenate-style-name "^1.0.2" - -jss-plugin-default-unit@^10.0.0-alpha.7: - version "10.0.0-alpha.7" - resolved "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0-alpha.7.tgz#f6dd0a03d545e7bf243c062bae3a832ac8c5ff6d" - integrity sha512-auuJUbQaWMxoHOVFPrfZNZpZm9ab8PZeDyvey8nMt2lbokkmZ53UyAnM/1kNsg5BdAXTItcLDxDB3I4gwNU84g== - dependencies: - "@babel/runtime" "^7.0.0" - -jss-plugin-global@^10.0.0-alpha.7: - version "10.0.0-alpha.7" - resolved "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.0.0-alpha.7.tgz#38ca390802b62da490afbaafc581552a81977729" - integrity sha512-OWeoW4szLDgRUKviST+xfilqa8O5uXJCW+O3YonheCRTRJg6rRzlE/b5pfYPoU9UtwvY9n7JvwBX5r3c1lMsEQ== - dependencies: - "@babel/runtime" "^7.0.0" - -jss-plugin-nested@^10.0.0-alpha.7: - version "10.0.0-alpha.7" - resolved "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.0.0-alpha.7.tgz#03a89c8f7c1d570a3d5f16dae3e61f7f2edb0316" - integrity sha512-wsRzuIZXAc6WMjc61mREW9cUrDxgSI7dK/fx5c7a06IDUfSn+83NJ30J/RB4oBnbQW9SijV/muujz7IJqpn9Gw== - dependencies: - "@babel/runtime" "^7.0.0" - tiny-warning "^1.0.2" - -jss-plugin-props-sort@^10.0.0-alpha.7: - version "10.0.0-alpha.7" - resolved "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0-alpha.7.tgz#46f1809fcae0acc048d0047aa54a4b9b6973597d" - integrity sha512-KXOCaHUk1+KXqE0z3q66/w1fDoy+VsZvI77gLxOqTsTrvIKFLX0jarwXogW3CDlaPQQFTZ6JykJJXtPRTBlstA== - dependencies: - "@babel/runtime" "^7.0.0" - -jss-plugin-rule-value-function@^10.0.0-alpha.7: - version "10.0.0-alpha.7" - resolved "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0-alpha.7.tgz#63df1078ac361dda67996e25291d90f7226ae59a" - integrity sha512-ett83hvIM69/LknmrWndrrdiDlfLfP+rneU5qP7gTOWJ7g1P9GuEL1Tc4CWdZUWBX+T58tgIBP0V1pzWCkP0QA== - dependencies: - "@babel/runtime" "^7.0.0" - -jss-plugin-vendor-prefixer@^10.0.0-alpha.7: - version "10.0.0-alpha.7" - resolved "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0-alpha.7.tgz#caa34eb0bc39f0c98f425e174fc220d1f1a8760a" - integrity sha512-YbIVgqq+dLimOBOEYggho1Iuc0roz4PJSZYyaok9n8JnXVIqPnxYJbr8+bMbvzJ5CL3eeJij/e7L2IPCceRKrA== - dependencies: - "@babel/runtime" "^7.0.0" - css-vendor "^1.1.0" - jss-props-sort@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz#9105101a3b5071fab61e2d85ea74cc22e9b16323" @@ -7539,16 +7453,6 @@ jss-vendor-prefixer@^7.0.0: dependencies: css-vendor "^0.3.8" -jss@^10.0.0-alpha.7: - version "10.0.0-alpha.8" - resolved "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.8.tgz#7bf6232046e131c8bb6edafd01d13beab06db0da" - integrity sha512-7cNQXMbJ5KQOgTJSaDPfLInBIaU5AD+FYg00PCl9i170NXj3M/CsoIWUMnTGbsWjcIQ7DmlqzrSFdsxSwzHjuA== - dependencies: - "@babel/runtime" "^7.0.0" - is-in-browser "^1.1.3" - symbol-observable "^1.2.0" - tiny-warning "^1.0.2" - jss@^9.8.7: version "9.8.7" resolved "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz#ed9763fc0f2f0260fc8260dac657af61e622ce05" @@ -12405,7 +12309,7 @@ svgo@^1.0.0: unquote "~1.1.1" util.promisify "~1.0.0" -symbol-observable@1.2.0, symbol-observable@^1.0.4, symbol-observable@^1.1.0, symbol-observable@^1.2.0: +symbol-observable@1.2.0, symbol-observable@^1.0.4, symbol-observable@^1.1.0: version "1.2.0" resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== @@ -12531,11 +12435,6 @@ timsort@^0.3.0: resolved "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= -tiny-warning@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.2.tgz#1dfae771ee1a04396bdfde27a3adcebc6b648b28" - integrity sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q== - tmp@^0.0.33: version "0.0.33" resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" From e9168a8a30fa4732e4a839e68608f944787836af Mon Sep 17 00:00:00 2001 From: Priscila Oliveira Date: Sun, 20 Jan 2019 12:02:02 +0100 Subject: [PATCH 3/3] refactor: added new style --- src/webui/components/Versions/index.js | 62 +++++++++++++++---------- src/webui/components/Versions/styles.js | 23 +++++++++ 2 files changed, 60 insertions(+), 25 deletions(-) create mode 100644 src/webui/components/Versions/styles.js diff --git a/src/webui/components/Versions/index.js b/src/webui/components/Versions/index.js index e6517b43a..bea3ae6c4 100644 --- a/src/webui/components/Versions/index.js +++ b/src/webui/components/Versions/index.js @@ -3,37 +3,49 @@ * @flow */ -import React from 'react'; -import List from '@material-ui/core/List/index'; -import ListItem from '@material-ui/core/ListItem/index'; - import { DetailContextConsumer } from '../../pages/version/index'; +import { formatDateDistance } from '../../utils/package'; +import { Heading, Spacer, ListItemText } from './styles'; +import List from '@material-ui/core/List'; +import ListItem from '@material-ui/core/ListItem'; +import React from 'react'; -class Versions extends React.Component { +class Versions extends React.PureComponent { render() { - return ( - // $FlowFixMe - - {({ packageMeta }) => { - const { versions } = packageMeta; - if (versions) { - return this.renderVersions(versions); - } - }} - - ); + return {({ packageMeta }) => this.renderContent(packageMeta['dist-tags'], packageMeta.versions)}; } + renderPackageList = (packages: object, isVersion: boolean = false) => ( + + {Object.keys(packages) + .reverse() + .map(version => ( + + {version} + + {isVersion ? `${formatDateDistance('2017-10-26T09:03:15.044Z')} ago` : packages[version]} + + ))} + + ); + // $FlowFixMe - renderVersions(versions) { - return ( - - {Object.keys(versions).map(version => ( - {versions[version].name} - ))} - - ); - } + renderContent = (distTags, versions) => ( + <> + {distTags && ( + <> + {'Current Tags'} + {this.renderPackageList(distTags)} + + )} + {versions && ( + <> + {'Version History'} + {this.renderPackageList(versions, true)} + + )} + + ); } export default Versions; diff --git a/src/webui/components/Versions/styles.js b/src/webui/components/Versions/styles.js new file mode 100644 index 000000000..8a2655ca9 --- /dev/null +++ b/src/webui/components/Versions/styles.js @@ -0,0 +1,23 @@ +import styled from 'react-emotion'; +import Typography from '@material-ui/core/Typography'; +import { default as MuiListItemText } from '@material-ui/core/ListItemText'; + +export const Heading = styled(Typography)` + font-weight: 700; +`; + +export const Spacer = styled('div')` + flex: 1 1 auto; + border-bottom: 1px dotted rgba(0, 0, 0, .2); + white-space: nowrap; + height: 0.5em; +`; + +export const ListItemText = styled(MuiListItemText)` + && { + flex: none; + color: black; + opacity: .6; + } +`; +