From 1303d9e8597e984bd1ee8cd080933170662636c3 Mon Sep 17 00:00:00 2001 From: lttb Date: Sun, 28 May 2017 21:54:43 +0300 Subject: [PATCH 1/3] Upgrade styled-jss --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a9431e8..53d33d3 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "recompose": "^0.23.4", "rockey-react": "0.0.15-1", "styled-components": "^2.0.0", - "styled-jss": "^1.0.1", + "styled-jss": "^1.1.1", "styletron": "^2.5.7", "styletron-client": "^2.5.7", "styletron-react": "^2.5.8", From 9325b6db1b35e4da864f2b65aafffb9301d687be Mon Sep 17 00:00:00 2001 From: lttb Date: Sun, 28 May 2017 21:54:50 +0300 Subject: [PATCH 2/3] Update yarn.lock --- yarn.lock | 131 +++++++++++++++--------------------------------------- 1 file changed, 36 insertions(+), 95 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5110410..0300ebb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -349,7 +349,7 @@ babel-code-frame@6.22.0, babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, bab esutils "^2.0.2" js-tokens "^3.0.0" -babel-core@6.24.1, babel-core@^6.24.1: +babel-core@6.24.1, babel-core@^6.0.0, babel-core@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83" dependencies: @@ -373,30 +373,6 @@ babel-core@6.24.1, babel-core@^6.24.1: slash "^1.0.0" source-map "^0.5.0" -babel-core@^6.0.0: - version "6.22.1" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.22.1.tgz#9c5fd658ba1772d28d721f6d25d968fc7ae21648" - dependencies: - babel-code-frame "^6.22.0" - babel-generator "^6.22.0" - babel-helpers "^6.22.0" - babel-messages "^6.22.0" - babel-register "^6.22.0" - babel-runtime "^6.22.0" - babel-template "^6.22.0" - babel-traverse "^6.22.1" - babel-types "^6.22.0" - babylon "^6.11.0" - convert-source-map "^1.1.0" - debug "^2.1.1" - json5 "^0.5.0" - lodash "^4.2.0" - minimatch "^3.0.2" - path-is-absolute "^1.0.0" - private "^0.1.6" - slash "^1.0.0" - source-map "^0.5.0" - babel-eslint@7.2.3: version "7.2.3" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827" @@ -406,7 +382,7 @@ babel-eslint@7.2.3: babel-types "^6.23.0" babylon "^6.17.0" -babel-generator@^6.18.0, babel-generator@^6.22.0, babel-generator@^6.24.1: +babel-generator@^6.18.0, babel-generator@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497" dependencies: @@ -521,7 +497,7 @@ babel-helper-replace-supers@^6.24.1: babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-helpers@^6.22.0, babel-helpers@^6.24.1: +babel-helpers@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" dependencies: @@ -544,7 +520,7 @@ babel-loader@7.0.0: loader-utils "^1.0.2" mkdirp "^0.5.1" -babel-messages@^6.22.0, babel-messages@^6.23.0: +babel-messages@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" dependencies: @@ -942,7 +918,7 @@ babel-preset-react@6.24.1: babel-plugin-transform-react-jsx-source "^6.22.0" babel-preset-flow "^6.23.0" -babel-register@^6.22.0, babel-register@^6.24.1: +babel-register@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f" dependencies: @@ -961,7 +937,7 @@ babel-runtime@6.23.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtim core-js "^2.4.0" regenerator-runtime "^0.10.0" -babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.24.1: +babel-template@^6.16.0, babel-template@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333" dependencies: @@ -971,7 +947,7 @@ babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.24.1: babylon "^6.11.0" lodash "^4.2.0" -babel-traverse@^6.18.0, babel-traverse@^6.22.1, babel-traverse@^6.23.1, babel-traverse@^6.24.1: +babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695" dependencies: @@ -985,7 +961,7 @@ babel-traverse@^6.18.0, babel-traverse@^6.22.1, babel-traverse@^6.23.1, babel-tr invariant "^2.2.0" lodash "^4.2.0" -babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23.0, babel-types@^6.24.1: +babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975" dependencies: @@ -998,11 +974,11 @@ babylon@7.0.0-beta.8: version "7.0.0-beta.8" resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.8.tgz#2bdc5ae366041442c27e068cce6f0d7c06ea9949" -babylon@^6.11.0, babylon@^6.15.0: +babylon@^6.11.0: version "6.15.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e" -babylon@^6.13.0, babylon@^6.17.0: +babylon@^6.13.0, babylon@^6.15.0, babylon@^6.17.0: version "6.17.1" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.1.tgz#17f14fddf361b695981fe679385e4f1c01ebd86f" @@ -1894,13 +1870,13 @@ debug@2.6.1: dependencies: ms "0.7.2" -debug@2.6.3, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0: +debug@2.6.3, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.6.0: version "2.6.3" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d" dependencies: ms "0.7.2" -debug@^2.6.0, debug@^2.6.3, debug@^2.6.6, debug@^2.6.8: +debug@^2.6.3, debug@^2.6.6, debug@^2.6.8: version "2.6.8" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" dependencies: @@ -2103,11 +2079,7 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -electron-to-chromium@^1.2.7: - version "1.3.5" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.5.tgz#6cd6ff2106224a6130e235f21050f9546bc3e729" - -electron-to-chromium@^1.3.11: +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.11: version "1.3.13" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz#1b3a5eace6e087bb5e257a100b0cbfe81b2891fc" @@ -2962,14 +2934,10 @@ got@^5.0.0: unzip-response "^1.0.2" url-parse-lax "^1.0.0" -graceful-fs@4.1.11, graceful-fs@^4.1.11: +graceful-fs@4.1.11, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: - version "4.1.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.10.tgz#f2d720c22092f743228775c75e3612632501f131" - "graceful-readlink@>= 1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" @@ -3232,14 +3200,10 @@ iconv-lite@0.4.13: version "0.4.13" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2" -iconv-lite@^0.4.17: +iconv-lite@^0.4.17, iconv-lite@~0.4.13: version "0.4.17" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d" -iconv-lite@~0.4.13: - version "0.4.15" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb" - icss-replace-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5" @@ -3640,7 +3604,7 @@ istanbul-api@^1.1.1: mkdirp "^0.5.1" once "^1.4.0" -istanbul-lib-coverage@^1.0.1, istanbul-lib-coverage@^1.0.2: +istanbul-lib-coverage@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1" @@ -3654,19 +3618,7 @@ istanbul-lib-hook@^1.0.7: dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.4.2: - version "1.7.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659" - dependencies: - babel-generator "^6.18.0" - babel-template "^6.16.0" - babel-traverse "^6.18.0" - babel-types "^6.18.0" - babylon "^6.13.0" - istanbul-lib-coverage "^1.0.2" - semver "^5.3.0" - -istanbul-lib-instrument@^1.7.2: +istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.2.tgz#6014b03d3470fb77638d5802508c255c06312e56" dependencies: @@ -4111,16 +4063,9 @@ jss-vendor-prefixer@^5.0.0: dependencies: css-vendor "^0.3.8" -jss@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/jss/-/jss-7.1.1.tgz#b04ce8bfa60123a8b423e0edf17af8d008a5e8e5" - dependencies: - is-in-browser "1.0.2" - warning "3.0.0" - -jss@^7.1.2: - version "7.1.4" - resolved "https://registry.yarnpkg.com/jss/-/jss-7.1.4.tgz#bfe03ee5e85acae4355106cdd92af95dee63904a" +jss@^7.0.0, jss@^7.1.5: + version "7.1.5" + resolved "https://registry.yarnpkg.com/jss/-/jss-7.1.5.tgz#7d27b07b0f2f7f1a2ec9fe0ee1e2ab3f9d903de5" dependencies: is-in-browser "1.0.2" warning "3.0.0" @@ -6035,30 +5980,30 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" -rockey-css-parse@^0.0.14: - version "0.0.14" - resolved "https://registry.yarnpkg.com/rockey-css-parse/-/rockey-css-parse-0.0.14.tgz#5e927753a17b255d7160fac3df4be061c09c9a9c" +rockey-css-parse@^0.0.15-1: + version "0.0.15-1" + resolved "https://registry.yarnpkg.com/rockey-css-parse/-/rockey-css-parse-0.0.15-1.tgz#97d3d9bc1ac68e9416dd5b579b6d53d880339aa5" dependencies: lodash "^4.17.4" -rockey-react@0.0.14-alpha.fa05b467: - version "0.0.14-alpha.fa05b467" - resolved "https://registry.yarnpkg.com/rockey-react/-/rockey-react-0.0.14-alpha.fa05b467.tgz#f3ac45c5d0a8e0d88190bfa0ce060dbc19dc3717" +rockey-react@0.0.15-1: + version "0.0.15-1" + resolved "https://registry.yarnpkg.com/rockey-react/-/rockey-react-0.0.15-1.tgz#b6fef64de466ae63d971796cd9bad8783a69accd" dependencies: classnames "^2.2.5" is-react-prop "^0.1.2" lodash "^4.17.4" - rockey "^0.0.14-alpha.fa05b467" + rockey "^0.0.15-1" -rockey@^0.0.14-alpha.fa05b467: - version "0.0.14" - resolved "https://registry.yarnpkg.com/rockey/-/rockey-0.0.14.tgz#00e32440d7c763d7b7cf8be2f94fe3f2d2797754" +rockey@^0.0.15-1: + version "0.0.15-1" + resolved "https://registry.yarnpkg.com/rockey/-/rockey-0.0.15-1.tgz#7eb17859d6fee0a5fe62f31fab09d7ad6709de92" dependencies: asap "^2.0.5" classnames "^2.2.5" css-vendor "^0.3.8" lodash "^4.17.4" - rockey-css-parse "^0.0.14" + rockey-css-parse "^0.0.15-1" run-async@^0.1.0: version "0.1.0" @@ -6518,12 +6463,12 @@ styled-components@^2.0.0: stylis "^2.0.0" supports-color "^3.2.3" -styled-jss@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/styled-jss/-/styled-jss-1.0.1.tgz#55365cb82644409194bbde472f7dd1942d8dc69c" +styled-jss@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/styled-jss/-/styled-jss-1.1.1.tgz#32c585e6c4f48c63bc53c440ba8ed877ce89cc88" dependencies: is-react-prop "^0.1.2" - jss "^7.1.2" + jss "^7.1.5" jss-preset-default "^2.0.0" styletron-client@^2.5.7: @@ -7165,14 +7110,10 @@ whatwg-encoding@^1.0.1: dependencies: iconv-lite "0.4.13" -whatwg-fetch@2.0.3: +whatwg-fetch@2.0.3, whatwg-fetch@>=0.10.0: version "2.0.3" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84" -whatwg-fetch@>=0.10.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz#fe294d1d89e36c5be8b3195057f2e4bc74fc980e" - whatwg-url@^4.3.0: version "4.7.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.7.0.tgz#202035ac1955b087cdd20fa8b58ded3ab1cd2af5" From 2bdab01eca3a40fa15f41a1982c1e572e8462e77 Mon Sep 17 00:00:00 2001 From: lttb Date: Sun, 28 May 2017 21:55:02 +0300 Subject: [PATCH 3/3] Fix DifferentBlocks for styled-jss --- src/scenes/StyledJss/DifferentBlocks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scenes/StyledJss/DifferentBlocks.js b/src/scenes/StyledJss/DifferentBlocks.js index 152d38f..ded2b26 100644 --- a/src/scenes/StyledJss/DifferentBlocks.js +++ b/src/scenes/StyledJss/DifferentBlocks.js @@ -7,7 +7,7 @@ const components = []; for (let i = 0; i < config.size; i++) { let size = Math.round(i / 10 % 1 * 10); - const component = styled(Block, { + const component = styled(Block)({ border: `${size + 2}px solid #000`, borderRadius: `${size * 6}px`, });