From 3e38eb37f0a6e0ac57810f1297cbcc07954a2774 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 14 Aug 2019 17:35:50 -0700 Subject: [PATCH 1/5] docs(button): add copy Signed-off-by: Machiko Yasuda --- package/src/components/Button/Button.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/src/components/Button/Button.md b/package/src/components/Button/Button.md index 7b4132da..3b493b6c 100644 --- a/package/src/components/Button/Button.md +++ b/package/src/components/Button/Button.md @@ -1,3 +1,7 @@ +### Overview + +Buttons allow users to take an action such as add, save, cancel or delete. Buttons should clearly and simply communicate the action that will happen when they are pressed. + ```jsx noeditor
From 1e990f8cb67da1226db32bfe1c803c7464fdfb3b Mon Sep 17 00:00:00 2001 From: Will Lopez Date: Thu, 15 Aug 2019 15:33:20 -0700 Subject: [PATCH 2/5] chore: upgrade to react 16.9.0 Signed-off-by: Will Lopez --- package.json | 4 ++-- package/package.json | 2 +- yarn.lock | 28 +++++++++++++++++++++++----- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index e3424469..07b91a5e 100644 --- a/package.json +++ b/package.json @@ -104,8 +104,8 @@ "@reactioncommerce/components-context": "~1.2.0", "commitlint": "^8.0.0", "prop-types": "~15.6.2", - "react": "~16.8.6", - "react-dom": "~16.8.6" + "react": "~16.9.0", + "react-dom": "~16.9.0" }, "devDependencies": { "@babel/cli": "~7.2.3", diff --git a/package/package.json b/package/package.json index 44b7ade1..c831b356 100644 --- a/package/package.json +++ b/package/package.json @@ -89,6 +89,6 @@ "@reactioncommerce/components-context": "~1.2.0", "@material-ui/core": ">=4.3.2 < 5", "prop-types": "~15.6.2", - "react-dom": "~16.8.6" + "react-dom": "~16.9.0" } } diff --git a/yarn.lock b/yarn.lock index 988b1d37..00011913 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10141,14 +10141,15 @@ react-docgen@^4.1.0: node-dir "^0.1.10" recast "^0.17.3" -react-dom@~16.8.6: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f" +react-dom@~16.9.0: + version "16.9.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962" + integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.6" + scheduler "^0.15.0" react-error-overlay@^5.1.0, react-error-overlay@^5.1.4: version "5.1.6" @@ -10262,7 +10263,7 @@ react-transition-group@^4.0.0: loose-envify "^1.4.0" prop-types "^15.6.2" -react@^16.0.0, react@~16.8.6: +react@^16.0.0: version "16.8.6" resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe" dependencies: @@ -10271,6 +10272,15 @@ react@^16.0.0, react@~16.8.6: prop-types "^15.6.2" scheduler "^0.13.6" +react@~16.9.0: + version "16.9.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa" + integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + read-cmd-shim@^1.0.1, read-cmd-shim@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b" @@ -10946,6 +10956,14 @@ scheduler@^0.13.6: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e" + integrity sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" From 6228969f007beb0ca58c6369c2a1d8db8ea17216 Mon Sep 17 00:00:00 2001 From: Will Lopez Date: Thu, 15 Aug 2019 15:43:12 -0700 Subject: [PATCH 3/5] chore: import regeneratior runtime in jest env Signed-off-by: Will Lopez --- package/src/setupTests.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/src/setupTests.js b/package/src/setupTests.js index d7c2a0fb..5af5a62b 100644 --- a/package/src/setupTests.js +++ b/package/src/setupTests.js @@ -1,3 +1,6 @@ +// Add async/await features +import "regenerator-runtime/runtime"; + // add some helpful assertions import "@testing-library/jest-dom/extend-expect"; From 6fad4aecb7531b9751b33d4fedb54cb2d480ec7b Mon Sep 17 00:00:00 2001 From: Mike Murray Date: Fri, 16 Aug 2019 16:27:00 -0700 Subject: [PATCH 4/5] fix: revert hoverOpacity to default theme value Signed-off-by: Mike Murray --- package/src/theme/defaultTheme.js | 1 - 1 file changed, 1 deletion(-) diff --git a/package/src/theme/defaultTheme.js b/package/src/theme/defaultTheme.js index c632c7f9..b878ca3b 100644 --- a/package/src/theme/defaultTheme.js +++ b/package/src/theme/defaultTheme.js @@ -46,7 +46,6 @@ export const rawMuiTheme = { }, action: { hover: colors.reactionBlue100, - hoverOpacity: 1, selected: colors.black10 } }, From aefd8b3fd8f4a22a392c0246b0e0191823322735 Mon Sep 17 00:00:00 2001 From: Mike Murray Date: Fri, 16 Aug 2019 17:26:02 -0700 Subject: [PATCH 5/5] chore: update synk ignore Signed-off-by: Mike Murray --- .snyk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.snyk b/.snyk index b6cafe0e..7151808c 100644 --- a/.snyk +++ b/.snyk @@ -1,5 +1,5 @@ # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities. -version: v1.13.5 +version: v1.12.0 # ignores vulnerabilities until expiry date; change duration by modifying expiry date ignore: 'npm:hoek:20180212': @@ -77,5 +77,5 @@ ignore: 'npm:mem:20180117': - libnpx > yargs > os-locale > mem: reason: No update available - expires: '2019-08-16T03:20:49.029Z' + expires: '2019-09-16T00:24:48.037Z' patch: {}