From 21e1a4d04b493e7452bd089ca6f4d86ddafab3a8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 8 Jan 2021 00:09:52 +0000 Subject: [PATCH 1/9] Update wordpress monorepo --- package.json | 46 ++++++++++----------- packages/components/package.json | 18 ++++---- packages/currency/package.json | 2 +- packages/customer-effort-score/package.json | 4 +- packages/date/package.json | 4 +- packages/experimental/package.json | 2 +- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index de51a841833..541c7ad6df5 100644 --- a/package.json +++ b/package.json @@ -91,22 +91,22 @@ "dependencies": { "@woocommerce/e2e-environment": "0.1.6", "@wordpress/api-fetch": "2.2.8", - "@wordpress/base-styles": "3.1.0", - "@wordpress/components": "11.0.0", - "@wordpress/data": "4.16.1", - "@wordpress/data-controls": "1.10.1", - "@wordpress/date": "3.9.0", - "@wordpress/dom": "2.9.0", - "@wordpress/element": "2.13.1", - "@wordpress/hooks": "2.8.0", - "@wordpress/html-entities": "2.7.0", - "@wordpress/i18n": "3.11.0", - "@wordpress/icons": "2.0.0", - "@wordpress/keycodes": "2.11.0", + "@wordpress/base-styles": "3.3.0", + "@wordpress/components": "11.1.3", + "@wordpress/data": "4.26.1", + "@wordpress/data-controls": "1.20.1", + "@wordpress/date": "3.13.0", + "@wordpress/dom": "2.16.0", + "@wordpress/element": "2.19.0", + "@wordpress/hooks": "2.11.0", + "@wordpress/html-entities": "2.10.0", + "@wordpress/i18n": "3.17.0", + "@wordpress/icons": "2.9.0", + "@wordpress/keycodes": "2.18.0", "@wordpress/notices": "1.12.0", - "@wordpress/plugins": "2.22.0", - "@wordpress/url": "2.13.0", - "@wordpress/viewport": "2.15.1", + "@wordpress/plugins": "2.24.1", + "@wordpress/url": "2.21.0", + "@wordpress/viewport": "2.25.1", "classnames": "2.2.6", "core-js": "3.7.0", "debug": "4.3.1", @@ -160,16 +160,16 @@ "@woocommerce/number": "file:packages/number", "@woocommerce/tracks": "file:packages/tracks", "@wordpress/babel-plugin-makepot": "2.1.3", - "@wordpress/babel-preset-default": "4.17.0", - "@wordpress/browserslist-config": "2.6.0", - "@wordpress/custom-templated-path-webpack-plugin": "1.6.0", - "@wordpress/e2e-test-utils": "4.6.0", - "@wordpress/eslint-plugin": "7.1.0", + "@wordpress/babel-preset-default": "4.20.0", + "@wordpress/browserslist-config": "2.7.0", + "@wordpress/custom-templated-path-webpack-plugin": "1.7.0", + "@wordpress/e2e-test-utils": "4.16.1", + "@wordpress/eslint-plugin": "7.4.0", "@wordpress/jest-preset-default": "5.5.0", - "@wordpress/postcss-plugins-preset": "1.3.0", + "@wordpress/postcss-plugins-preset": "1.6.0", "@wordpress/postcss-themes": "1.0.5", - "@wordpress/prettier-config": "0.3.0", - "@wordpress/scripts": "12.0.0", + "@wordpress/prettier-config": "0.4.0", + "@wordpress/scripts": "12.6.1", "ast-types": "0.14.2", "autoprefixer": "10.2.1", "babel-core": "7.0.0-bridge.0", diff --git a/packages/components/package.json b/packages/components/package.json index da62731b465..09d47d87017 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -27,15 +27,15 @@ "@woocommerce/data": "1.1.1", "@woocommerce/date": "2.1.0", "@woocommerce/navigation": "5.2.0", - "@wordpress/components": "10.0.0", - "@wordpress/compose": "3.13.1", - "@wordpress/date": "3.9.0", - "@wordpress/dom": "2.9.0", - "@wordpress/element": "2.13.1", - "@wordpress/html-entities": "2.7.0", - "@wordpress/i18n": "3.11.0", - "@wordpress/keycodes": "2.11.0", - "@wordpress/viewport": "2.15.1", + "@wordpress/components": "10.2.0", + "@wordpress/compose": "3.23.1", + "@wordpress/date": "3.13.0", + "@wordpress/dom": "2.16.0", + "@wordpress/element": "2.19.0", + "@wordpress/html-entities": "2.10.0", + "@wordpress/i18n": "3.17.0", + "@wordpress/keycodes": "2.18.0", + "@wordpress/viewport": "2.25.1", "classnames": "2.2.6", "core-js": "3.7.0", "d3-axis": "1.0.12", diff --git a/packages/currency/package.json b/packages/currency/package.json index 8d9dabedb61..c2360bcfab2 100644 --- a/packages/currency/package.json +++ b/packages/currency/package.json @@ -24,7 +24,7 @@ "@babel/runtime-corejs2": "7.12.5", "@woocommerce/number": "2.0.0", "@wordpress/deprecated": "^2.9.0", - "@wordpress/html-entities": "2.7.0" + "@wordpress/html-entities": "2.10.0" }, "publishConfig": { "access": "public" diff --git a/packages/customer-effort-score/package.json b/packages/customer-effort-score/package.json index a74e079fafa..8f9ad757131 100644 --- a/packages/customer-effort-score/package.json +++ b/packages/customer-effort-score/package.json @@ -25,8 +25,8 @@ "@wordpress/components": "^11.1.1", "@wordpress/compose": "^3.22.0", "@wordpress/data": "^4.25.0", - "@wordpress/element": "2.13.1", - "@wordpress/i18n": "3.11.0", + "@wordpress/element": "2.19.0", + "@wordpress/i18n": "3.17.0", "@wordpress/notices": "^2.11.0", "classnames": "2.2.6", "prop-types": "15.7.2", diff --git a/packages/date/package.json b/packages/date/package.json index 81f01d48a10..f8d8046cacf 100644 --- a/packages/date/package.json +++ b/packages/date/package.json @@ -22,8 +22,8 @@ "react-native": "src/index", "dependencies": { "@babel/runtime-corejs2": "7.12.5", - "@wordpress/date": "3.9.0", - "@wordpress/i18n": "3.11.0", + "@wordpress/date": "3.13.0", + "@wordpress/i18n": "3.17.0", "lodash": "4.17.15", "moment": "2.29.1" }, diff --git a/packages/experimental/package.json b/packages/experimental/package.json index ffc676c4071..11c3b28f347 100644 --- a/packages/experimental/package.json +++ b/packages/experimental/package.json @@ -22,7 +22,7 @@ "react-native": "src/index", "dependencies": { "@babel/runtime": "7.12.5", - "@wordpress/components": "10.0.0" + "@wordpress/components": "10.2.0" }, "publishConfig": { "access": "public" From c38c7583bf04d5e2915b3fa987541d45c0c1052b Mon Sep 17 00:00:00 2001 From: Lourens Schep Date: Fri, 15 Jan 2021 15:44:33 -0400 Subject: [PATCH 2/9] Fix lint errors, and downgraded wp/viewport, as it broke the build --- client/inbox-panel/card.js | 12 +- package-lock.json | 1615 +++++++++-------- packages/components/package.json | 2 +- packages/eslint-plugin/README.md | 15 +- packages/eslint-plugin/configs/recommended.js | 1 + packages/eslint-plugin/package.json | 4 +- 6 files changed, 854 insertions(+), 795 deletions(-) diff --git a/client/inbox-panel/card.js b/client/inbox-panel/card.js index dd9b97c6a01..c0ccbf3e9bc 100644 --- a/client/inbox-panel/card.js +++ b/client/inbox-panel/card.js @@ -32,6 +32,7 @@ class InboxNoteCard extends Component { this.openDismissModal = this.openDismissModal.bind( this ); this.closeDismissModal = this.closeDismissModal.bind( this ); this.bodyNotificationRef = createRef(); + this.toggleButtonRef = createRef(); this.screen = getScreenName(); } @@ -116,9 +117,13 @@ class InboxNoteCard extends Component { 'components-popover__content', ]; // This line is for IE compatibility. - const relatedTarget = event.relatedTarget - ? event.relatedTarget - : document.activeElement; + let relatedTarget; + if ( event.relatedTarget ) { + relatedTarget = event.relatedTarget; + } else if ( this.toggleButtonRef.current ) { + const ownerDoc = this.toggleButtonRef.current.ownerDocument; + relatedTarget = ownerDoc ? ownerDoc.activeElement : null; + } const isClickOutsideDropdown = relatedTarget ? dropdownClasses.some( ( className ) => relatedTarget.className.includes( className ) @@ -146,6 +151,7 @@ class InboxNoteCard extends Component {