From 4a69b5be0b1ef33a952e99340614bb80f7d01a5d Mon Sep 17 00:00:00 2001 From: Andrew Musgrave Date: Fri, 8 Feb 2019 13:21:08 -0500 Subject: [PATCH 1/2] Install merge --- examples/create-react-app/package.json | 1 + examples/create-react-app/yarn.lock | 175 ++++++++++++++++++++----- 2 files changed, 141 insertions(+), 35 deletions(-) diff --git a/examples/create-react-app/package.json b/examples/create-react-app/package.json index f90bd2a06e5..dc11a639c61 100644 --- a/examples/create-react-app/package.json +++ b/examples/create-react-app/package.json @@ -4,6 +4,7 @@ "private": true, "dependencies": { "@shopify/polaris": "^2.2.0", + "lodash": "^4.17.11", "react": "^16.3.1", "react-dom": "^16.3.1", "react-scripts": "1.1.4" diff --git a/examples/create-react-app/yarn.lock b/examples/create-react-app/yarn.lock index d7fdf66d790..e62a8ae1afe 100644 --- a/examples/create-react-app/yarn.lock +++ b/examples/create-react-app/yarn.lock @@ -15,16 +15,29 @@ lodash "^4.17.4" lodash-decorators "^4.3.5" -"@shopify/polaris@^2.1.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@shopify/polaris/-/polaris-2.2.0.tgz#f781cb4bc4b55268124e4df1f6e1eef2a18b4f99" +"@shopify/javascript-utilities@^2.2.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@shopify/javascript-utilities/-/javascript-utilities-2.4.0.tgz#2ffd528b0632af0392b860f33b4c5ed5c72cdafa" + integrity sha512-ZfQo1i87iKsSR7mkJOk3/7aPgfuXPrTTbM0dUJTlzdyf13ftJ2Val/WdMicaCVFu2r60uSsqoq/QpF0fLFVlcQ== + dependencies: + "@types/lodash" "^4.14.65" + "@types/react" "^16.0.2" + lodash "^4.17.4" + lodash-decorators "^4.3.5" + +"@shopify/polaris@^2.2.0": + version "2.12.1" + resolved "https://registry.yarnpkg.com/@shopify/polaris/-/polaris-2.12.1.tgz#6eb7261add3fb124a1c9d2201d5d641a46035b4a" + integrity sha512-V0bwrqMtMTMBL6IuFRT6DpC9MKiRfnHLYnvYUI1wlsYMxUVuPxPWm3ptWzGdUl9BsQ7oUKEjmkrgwf1I3udShg== dependencies: "@shopify/images" "^1.1.0" - "@shopify/javascript-utilities" "^2.1.0" - "@shopify/react-utilities" "2.0.0-beta.9" + "@shopify/javascript-utilities" "^2.2.0" + "@shopify/react-compose" "^0.1.6" + "@shopify/react-html" "^3.0.3" + "@shopify/react-utilities" "^2.0.3" "@types/prop-types" "^15.5.2" - "@types/react" "^16.3.5" - "@types/react-dom" "^16.0.4" + "@types/react" "^16.4.7" + "@types/react-dom" "^16.0.6" "@types/react-transition-group" "^2.0.7" babel-runtime "^6.23.0" core-js "^2.5.1" @@ -35,16 +48,42 @@ react-transition-group "^2.3.0" tslib "^1.8.0" -"@shopify/react-utilities@2.0.0-beta.9": - version "2.0.0-beta.9" - resolved "https://registry.yarnpkg.com/@shopify/react-utilities/-/react-utilities-2.0.0-beta.9.tgz#0b1df35bb7bc0369adc955c6ea59a743bffc1ef1" +"@shopify/react-compose@^0.1.6": + version "0.1.10" + resolved "https://registry.yarnpkg.com/@shopify/react-compose/-/react-compose-0.1.10.tgz#7121229c82ecb699ffd165b98a17be6126e1d58e" + integrity sha512-VjWIg7vq4cSv1Z1H90ofThsdR0uFC8vRnOEgiBdCOb7qaKrtkWGcllBe1vk6qGLxJBZaL+YmnBXVctSp//tIqQ== + dependencies: + hoist-non-react-statics "^3.0.1" + tslib "^1.9.3" + +"@shopify/react-html@^3.0.3": + version "3.0.6" + resolved "https://registry.yarnpkg.com/@shopify/react-html/-/react-html-3.0.6.tgz#49d8ba0d582eefdda027c19b49297649c24a948c" + integrity sha512-wFIcDYLCHDWRQ7l9CrK7IV3qXA7vzufh4dRg1bAsOmvat4d9zVHzodQ3jz5JlhEKPpbdUf0PARFBPkgezjmb5A== + dependencies: + "@shopify/react-serialize" "^1.0.8" + react-helmet "^5.2.0" + +"@shopify/react-serialize@^1.0.8": + version "1.0.12" + resolved "https://registry.yarnpkg.com/@shopify/react-serialize/-/react-serialize-1.0.12.tgz#67967e1bcd049f85ac01291a5e80fc74f1492b06" + integrity sha512-5/8YNjfTXK4pSMa0pe4f5dad+aIXmtj7vp5Bwsy+EuXD3r7je0uzXMUxBpyE9RQHzSCOhJolm8dUSqr0EIn01w== + dependencies: + serialize-javascript "^1.5.0" + tslib "^1.9.3" + +"@shopify/react-utilities@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@shopify/react-utilities/-/react-utilities-2.0.3.tgz#424421e7202b402ec7934c137b5b7e035fbeb33c" + integrity sha512-Mq0xbWPlufbx7ABH7cup2SQYVmhBFO6bAdAWUEkh8mWY56l2Bpb+VUffmwYmxxcBvtej/lgCCBvG60Vrxcb66g== dependencies: "@shopify/javascript-utilities" "^2.1.0" "@types/classnames" "^2.2.3" - "@types/node" "^8.0.41" - "@types/react" "^16.0.10" + "@types/node" "^10.0.8" + "@types/react" "^16.3.14" + "@types/react-dom" "^16.0.5" classnames "^2.2.5" - core-js "^2.5.1" + core-js "^2.5.6" "@types/classnames@^2.2.3": version "2.2.3" @@ -58,19 +97,25 @@ version "9.4.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e" -"@types/node@^8.0.41": - version "8.9.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.9.4.tgz#dfd327582a06c114eb6e0441fa3d6fab35edad48" +"@types/node@^10.0.8": + version "10.12.24" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.24.tgz#b13564af612a22a20b5d95ca40f1bffb3af315cf" + integrity sha512-GWWbvt+z9G5otRBW8rssOFgRY87J9N/qbhqfjMZ+gUuL6zoL+Hm6gP/8qQBG4jjimqdaNLCehcVapZ/Fs2WjCQ== + +"@types/prop-types@*": + version "15.5.8" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.8.tgz#8ae4e0ea205fe95c3901a5a1df7f66495e3a56ce" + integrity sha512-3AQoUxQcQtLHsK25wtTWIoIpgYjH3vSDroZOUr7PpCHw/jLY1RB9z9E8dBT/OSmwStVgkRNvdh+ZHNiomRieaw== "@types/prop-types@^15.5.2": version "15.5.2" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.2.tgz#3c6b8dceb2906cc87fe4358e809f9d20c8d59be1" -"@types/react-dom@^16.0.4": - version "16.0.5" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.5.tgz#a757457662e3819409229e8f86795ff37b371f96" +"@types/react-dom@^16.0.5", "@types/react-dom@^16.0.6": + version "16.8.0" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.0.tgz#c565f43f9d2ec911f9e0b8f3b74e25e67879aa3f" + integrity sha512-Jp4ufcEEjVJEB0OHq2MCZcE1u3KYUKO6WnSuiU/tZeYeiZxUoQavfa/TZeiIT+1XoN6l0lQVNM30VINZFDeolQ== dependencies: - "@types/node" "*" "@types/react" "*" "@types/react-transition-group@^2.0.7": @@ -79,14 +124,16 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^16.0.10", "@types/react@^16.0.2": +"@types/react@*", "@types/react@^16.0.2": version "16.0.38" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.38.tgz#76617433ea10274505f60bb86eddfdd0476ffdc2" -"@types/react@^16.3.5": - version "16.3.13" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.13.tgz#47d466462b774556c1174ea0eda22c0578643362" +"@types/react@^16.3.14", "@types/react@^16.4.7": + version "16.8.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.2.tgz#3b7a7f7ea89d1c7d68b00849fb5de839011c077b" + integrity sha512-6mcKsqlqkN9xADrwiUz2gm9Wg4iGnlVGciwBRYFQSMWG6MQjhOZ/AVnxn+6v8nslFgfYTV8fNdE6XwKu6va5PA== dependencies: + "@types/prop-types" "*" csstype "^2.2.0" abab@^1.0.3: @@ -1640,6 +1687,11 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.1: version "2.5.3" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" +core-js@^2.5.6: + version "2.6.4" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.4.tgz#b8897c062c4d769dd30a0ac5c73976c47f92ea0d" + integrity sha512-05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A== + core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -2169,16 +2221,6 @@ entities@^1.1.1, entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" -enzyme-adapter-react-15@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15/-/enzyme-adapter-react-15-1.0.5.tgz#99f9a03ff2c2303e517342935798a6bdfbb75fac" - dependencies: - enzyme-adapter-utils "^1.1.0" - lodash "^4.17.4" - object.assign "^4.0.4" - object.values "^1.0.4" - prop-types "^15.5.10" - enzyme-adapter-react-16@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz#a8f4278b47e082fbca14f5bfb1ee50ee650717b4" @@ -2191,7 +2233,7 @@ enzyme-adapter-react-16@^1.1.1: react-reconciler "^0.7.0" react-test-renderer "^16.0.0-0" -enzyme-adapter-utils@^1.1.0, enzyme-adapter-utils@^1.3.0: +enzyme-adapter-utils@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.3.0.tgz#d6c85756826c257a8544d362cc7a67e97ea698c7" dependencies: @@ -2552,6 +2594,11 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +exenv@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d" + integrity sha1-KueOhdmJQVhnCwPUe+wfA72Ru50= + expand-brackets@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" @@ -3159,6 +3206,13 @@ hoist-non-react-statics@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40" +hoist-non-react-statics@^3.0.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b" + integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA== + dependencies: + react-is "^16.7.0" + home-or-tmp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" @@ -4212,6 +4266,11 @@ lodash.uniq@^4.5.0: version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" +lodash@^4.17.11: + version "4.17.11" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" + integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== + loglevel@^1.4.1: version "1.6.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" @@ -5300,6 +5359,14 @@ prop-types@^15.5.10, prop-types@^15.6.0: loose-envify "^1.3.1" object-assign "^4.1.1" +prop-types@^15.5.4: + version "15.7.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.1.tgz#2fa61e0a699d428b40320127733ee2931f05d9d1" + integrity sha512-f8Lku2z9kERjOCcnDOPm68EBJAO2K00Q5mSgPAUE/gJuBgsYLbVy6owSrtcHj90zt8PvW+z0qaIIgsIhHOa1Qw== + dependencies: + object-assign "^4.1.1" + react-is "^16.8.1" + prop-types@^15.6.1: version "15.6.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" @@ -5471,10 +5538,25 @@ react-error-overlay@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4" +react-helmet@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-5.2.0.tgz#a81811df21313a6d55c5f058c4aeba5d6f3d97a7" + integrity sha1-qBgR3yExOm1VxfBYxK66XW89l6c= + dependencies: + deep-equal "^1.0.1" + object-assign "^4.1.1" + prop-types "^15.5.4" + react-side-effect "^1.1.0" + react-is@^16.4.1: version "16.4.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.1.tgz#d624c4650d2c65dbd52c72622bbf389435d9776e" +react-is@^16.7.0, react-is@^16.8.1: + version "16.8.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb" + integrity sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA== + react-reconciler@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d" @@ -5529,6 +5611,14 @@ react-scripts@1.1.4: optionalDependencies: fsevents "^1.1.3" +react-side-effect@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-1.1.5.tgz#f26059e50ed9c626d91d661b9f3c8bb38cd0ff2d" + integrity sha512-Z2ZJE4p/jIfvUpiUMRydEVpQRf2f8GMHczT6qLcARmX7QRb28JDBTpnM2g/i5y/p7ZDEXYGHWg0RbhikE+hJRw== + dependencies: + exenv "^1.2.1" + shallowequal "^1.0.1" + react-test-renderer@^16.0.0-0: version "16.4.1" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.4.1.tgz#f2fb30c2c7b517db6e5b10ed20bb6b0a7ccd8d70" @@ -5966,6 +6056,11 @@ send@0.16.1: range-parser "~1.2.0" statuses "~1.3.1" +serialize-javascript@^1.5.0: + version "1.6.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879" + integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw== + serve-index@^1.7.2: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" @@ -6018,6 +6113,11 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" +shallowequal@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -6471,6 +6571,11 @@ tslib@^1.7.1, tslib@^1.8.0: version "1.9.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" +tslib@^1.9.3: + version "1.9.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" + integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" From b99f9f5752e81bc96eabae04eda8795f1c551f85 Mon Sep 17 00:00:00 2001 From: Andrew Musgrave Date: Tue, 26 Feb 2019 13:56:55 -0500 Subject: [PATCH 2/2] changelog --- UNRELEASED.md | 1 + 1 file changed, 1 insertion(+) diff --git a/UNRELEASED.md b/UNRELEASED.md index 99304c7e164..4004084e0c1 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -32,5 +32,6 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f ### Code quality - Removed all occurrences of `_.replace` ([#1012](https://github.com/Shopify/polaris-react/pull/1012)) +- Add lodash to `create-react-app` example ([#1010](https://github.com/Shopify/polaris-react/pull/1010)) ### Deprecations