Skip to content

Commit

Permalink
chore(deps): update wordpress monorepo (#80783)
Browse files Browse the repository at this point in the history 
* chore(deps): update wordpress monorepo

* Fix some packageExtensions and ignore logs

* Bump npm-package-json-lint dep

* isTertiary -> variant='tertiary'

* Add @floating-ui/utils dev dep to ETK

* Fix incorrect usage of MenuItem info prop

* Bump eslint-plugin-jsdoc to match the @wordpress/eslint-plugin version

* Remove broken ESLint rule

---------

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Marin Atanasov <tyxla@abv.bg>
Co-authored-by: Noah Allen <noahtallen@gmail.com>
  • Loading branch information
@matticbot @renovate-bot
@tyxla @noahtallen @pull
4 people authored and pull[bot] committed Nov 1, 2023
1 parent 9b1c61d commit 8057900
Show file tree
Hide file tree
Showing 48 changed files with 1,449 additions and 1,299 deletions.
28 changes: 7 additions & 21 deletions .yarnrc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ logFilters:
- level: discard
pattern: "calypso@workspace:client provides react (*) with version 18.2.0, which doesn't satisfy what react-day-picker requests"

# TODO: Remove after the `preact` dependency version has beem bumped in `@wordpress/interactivity.
- level: discard
pattern: "@wordpress/interactivity@npm:2.1.0 (*) provides preact (*) with version 10.15.1, which doesn't satisfy what deepsignal requests"

### Package extensions to provide missing peer dependencies. ###
packageExtensions:
"@automattic/newspack-blocks@*":
Expand All @@ -62,31 +66,13 @@ packageExtensions:
"@signal-noise/stylelint-scales@2.0.3":
peerDependencies:
postcss: "*"
"@wordpress/commands@0.10.0":
peerDependencies:
react-dom: "*"
"@wordpress/core-commands@0.8.0":
peerDependencies:
react-dom: "*"
"@wordpress/core-data@6.16.0":
peerDependencies:
react-dom: "*"
"@wordpress/data-controls@3.8.0":
peerDependencies:
react: "*"
"@wordpress/interactivity@2.0.0":
"@wordpress/interactivity@2.1.0":
peerDependencies:
react: '*'
"@wordpress/notices@4.7.0":
peerDependencies:
react: "*"
"@wordpress/plugins@6.7.0":
peerDependencies:
react-dom: "*"
"@wordpress/stylelint-config@21.22.0":
"@wordpress/stylelint-config@21.23.0":
peerDependencies:
postcss: "*"
"deepsignal@1.3.4":
deepsignal@1.3.6:
peerDependencies:
react: "*"
fake-indexeddb@3.1.7:
Expand Down
63 changes: 32 additions & 31 deletions apps/editing-toolkit/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,37 +68,37 @@
"@popperjs/core": "^2.11.8",
"@sentry/browser": "^7.54.0",
"@tanstack/react-query": "^4.29.1",
"@wordpress/a11y": "^3.39.0",
"@wordpress/api-fetch": "^6.36.0",
"@wordpress/base-styles": "^4.30.0",
"@wordpress/block-editor": "^12.7.0",
"@wordpress/blocks": "^12.16.0",
"@wordpress/components": "^25.5.0",
"@wordpress/compose": "^6.16.0",
"@wordpress/data": "^9.9.0",
"@wordpress/data-controls": "^3.8.0",
"@wordpress/date": "^4.39.0",
"@wordpress/a11y": "^3.40.0",
"@wordpress/api-fetch": "^6.37.0",
"@wordpress/base-styles": "^4.31.0",
"@wordpress/block-editor": "^12.8.0",
"@wordpress/blocks": "^12.17.0",
"@wordpress/components": "^25.6.0",
"@wordpress/compose": "^6.17.0",
"@wordpress/data": "^9.10.0",
"@wordpress/data-controls": "^3.9.0",
"@wordpress/date": "^4.40.0",
"@wordpress/dependency-extraction-webpack-plugin": "^4.21.0",
"@wordpress/dom-ready": "^3.39.0",
"@wordpress/edit-post": "^7.16.0",
"@wordpress/element": "^5.16.0",
"@wordpress/env": "^8.5.0",
"@wordpress/escape-html": "^2.39.0",
"@wordpress/hooks": "^3.39.0",
"@wordpress/html-entities": "^3.39.0",
"@wordpress/i18n": "^4.39.0",
"@wordpress/icons": "^9.30.0",
"@wordpress/interface": "^5.16.0",
"@wordpress/is-shallow-equal": "^4.39.0",
"@wordpress/keycodes": "^3.39.0",
"@wordpress/notices": "^4.7.0",
"@wordpress/nux": "^8.1.0",
"@wordpress/plugins": "^6.7.0",
"@wordpress/primitives": "^3.37.0",
"@wordpress/private-apis": "^0.21.0",
"@wordpress/rich-text": "^6.16.0",
"@wordpress/server-side-render": "^4.16.0",
"@wordpress/url": "^3.40.0",
"@wordpress/dom-ready": "^3.40.0",
"@wordpress/edit-post": "^7.17.0",
"@wordpress/element": "^5.17.0",
"@wordpress/env": "^8.6.0",
"@wordpress/escape-html": "^2.40.0",
"@wordpress/hooks": "^3.40.0",
"@wordpress/html-entities": "^3.40.0",
"@wordpress/i18n": "^4.40.0",
"@wordpress/icons": "^9.31.0",
"@wordpress/interface": "^5.17.0",
"@wordpress/is-shallow-equal": "^4.40.0",
"@wordpress/keycodes": "^3.40.0",
"@wordpress/notices": "^4.8.0",
"@wordpress/nux": "^8.2.0",
"@wordpress/plugins": "^6.8.0",
"@wordpress/primitives": "^3.38.0",
"@wordpress/private-apis": "^0.22.0",
"@wordpress/rich-text": "^6.17.0",
"@wordpress/server-side-render": "^4.17.0",
"@wordpress/url": "^3.41.0",
"calypso": "workspace:^",
"classnames": "^2.3.1",
"eslint": "^8.46.0",
Expand All @@ -120,11 +120,12 @@
"devDependencies": {
"@automattic/calypso-apps-builder": "workspace:^",
"@automattic/calypso-eslint-overrides": "workspace:^",
"@floating-ui/utils": "^0.1.1",
"@tanstack/eslint-plugin-query": "^4.29.8",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.0.0",
"@types/node": "^18.17.3",
"@wordpress/eslint-plugin": "^14.12.0",
"@wordpress/eslint-plugin": "^15.0.0",
"@wordpress/readable-js-assets-webpack-plugin": "^2.21.0",
"babel-jest": "^29.6.1",
"eslint-filtered-fix": "^0.3.0",
Expand Down
14 changes: 7 additions & 7 deletions apps/happy-blocks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
"@automattic/wp-babel-makepot": "workspace:^",
"@automattic/wpcom-template-parts": "workspace:^",
"@emotion/styled": "^11.11.0",
"@wordpress/base-styles": "^4.30.0",
"@wordpress/block-editor": "^12.7.0",
"@wordpress/blocks": "^12.16.0",
"@wordpress/components": "^25.5.0",
"@wordpress/data": "^9.9.0",
"@wordpress/element": "^5.16.0",
"@wordpress/i18n": "^4.39.0",
"@wordpress/base-styles": "^4.31.0",
"@wordpress/block-editor": "^12.8.0",
"@wordpress/blocks": "^12.17.0",
"@wordpress/components": "^25.6.0",
"@wordpress/data": "^9.10.0",
"@wordpress/element": "^5.17.0",
"@wordpress/i18n": "^4.40.0",
"classnames": "^2.3.2",
"glob": "^7.1.6",
"i18n-calypso": "workspace:^",
Expand Down
26 changes: 13 additions & 13 deletions apps/o2-blocks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
},
"dependencies": {
"@automattic/calypso-build": "workspace:^",
"@wordpress/api-fetch": "^6.36.0",
"@wordpress/base-styles": "^4.30.0",
"@wordpress/block-editor": "^12.7.0",
"@wordpress/blocks": "^12.16.0",
"@wordpress/components": "^25.5.0",
"@wordpress/data": "^9.9.0",
"@wordpress/editor": "^13.16.0",
"@wordpress/element": "^5.16.0",
"@wordpress/hooks": "^3.39.0",
"@wordpress/i18n": "^4.39.0",
"@wordpress/icons": "^9.30.0",
"@wordpress/is-shallow-equal": "^4.39.0",
"@wordpress/primitives": "^3.37.0",
"@wordpress/api-fetch": "^6.37.0",
"@wordpress/base-styles": "^4.31.0",
"@wordpress/block-editor": "^12.8.0",
"@wordpress/blocks": "^12.17.0",
"@wordpress/components": "^25.6.0",
"@wordpress/data": "^9.10.0",
"@wordpress/editor": "^13.17.0",
"@wordpress/element": "^5.17.0",
"@wordpress/hooks": "^3.40.0",
"@wordpress/i18n": "^4.40.0",
"@wordpress/icons": "^9.31.0",
"@wordpress/is-shallow-equal": "^4.40.0",
"@wordpress/primitives": "^3.38.0",
"classnames": "^2.3.1",
"lodash": "^4.17.21",
"moment": "^2.26.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/odyssey-stats/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"@automattic/calypso-url": "workspace:^",
"@automattic/components": "workspace:^",
"@tanstack/react-query": "4.29.1",
"@wordpress/base-styles": "^4.30.0",
"@wordpress/data": "^9.9.0",
"@wordpress/icons": "^9.30.0",
"@wordpress/base-styles": "^4.31.0",
"@wordpress/data": "^9.10.0",
"@wordpress/icons": "^9.31.0",
"calypso": "workspace:^",
"classnames": "^2.3.1",
"debug": "^4.3.4",
Expand Down
38 changes: 19 additions & 19 deletions apps/wpcom-block-editor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@
"@automattic/calypso-url": "workspace:^",
"@automattic/typography": "workspace:^",
"@babel/runtime": "^7.17.2",
"@wordpress/api-fetch": "^6.36.0",
"@wordpress/base-styles": "^4.30.0",
"@wordpress/block-editor": "^12.7.0",
"@wordpress/blocks": "^12.16.0",
"@wordpress/components": "^25.5.0",
"@wordpress/compose": "^6.16.0",
"@wordpress/data": "^9.9.0",
"@wordpress/dom-ready": "^3.39.0",
"@wordpress/edit-post": "^7.16.0",
"@wordpress/edit-site": "^5.16.0",
"@wordpress/editor": "^13.16.0",
"@wordpress/element": "^5.16.0",
"@wordpress/hooks": "^3.39.0",
"@wordpress/i18n": "^4.39.0",
"@wordpress/icons": "^9.30.0",
"@wordpress/is-shallow-equal": "^4.39.0",
"@wordpress/plugins": "^6.7.0",
"@wordpress/rich-text": "^6.16.0",
"@wordpress/url": "^3.40.0",
"@wordpress/api-fetch": "^6.37.0",
"@wordpress/base-styles": "^4.31.0",
"@wordpress/block-editor": "^12.8.0",
"@wordpress/blocks": "^12.17.0",
"@wordpress/components": "^25.6.0",
"@wordpress/compose": "^6.17.0",
"@wordpress/data": "^9.10.0",
"@wordpress/dom-ready": "^3.40.0",
"@wordpress/edit-post": "^7.17.0",
"@wordpress/edit-site": "^5.17.0",
"@wordpress/editor": "^13.17.0",
"@wordpress/element": "^5.17.0",
"@wordpress/hooks": "^3.40.0",
"@wordpress/i18n": "^4.40.0",
"@wordpress/icons": "^9.31.0",
"@wordpress/is-shallow-equal": "^4.40.0",
"@wordpress/plugins": "^6.8.0",
"@wordpress/rich-text": "^6.17.0",
"@wordpress/url": "^3.41.0",
"debug": "^4.3.3",
"lodash": "^4.17.21",
"react": "^18.2.0",
Expand Down
34 changes: 17 additions & 17 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,23 +78,23 @@
"@tanstack/react-query": "^4.29.1",
"@tanstack/react-query-devtools": "^4.29.1",
"@tanstack/react-query-persist-client": "^4.29.1",
"@wordpress/a11y": "^3.39.0",
"@wordpress/api-fetch": "^6.36.0",
"@wordpress/base-styles": "^4.30.0",
"@wordpress/blocks": "^12.16.0",
"@wordpress/components": "^25.5.0",
"@wordpress/compose": "^6.16.0",
"@wordpress/data": "^9.9.0",
"@wordpress/dom": "^3.39.0",
"@wordpress/edit-post": "^7.16.0",
"@wordpress/element": "^5.16.0",
"@wordpress/html-entities": "^3.39.0",
"@wordpress/i18n": "^4.39.0",
"@wordpress/icons": "^9.30.0",
"@wordpress/is-shallow-equal": "^4.39.0",
"@wordpress/react-i18n": "^3.37.0",
"@wordpress/url": "^3.40.0",
"@wordpress/warning": "^2.39.0",
"@wordpress/a11y": "^3.40.0",
"@wordpress/api-fetch": "^6.37.0",
"@wordpress/base-styles": "^4.31.0",
"@wordpress/blocks": "^12.17.0",
"@wordpress/components": "^25.6.0",
"@wordpress/compose": "^6.17.0",
"@wordpress/data": "^9.10.0",
"@wordpress/dom": "^3.40.0",
"@wordpress/edit-post": "^7.17.0",
"@wordpress/element": "^5.17.0",
"@wordpress/html-entities": "^3.40.0",
"@wordpress/i18n": "^4.40.0",
"@wordpress/icons": "^9.31.0",
"@wordpress/is-shallow-equal": "^4.40.0",
"@wordpress/react-i18n": "^3.38.0",
"@wordpress/url": "^3.41.0",
"@wordpress/warning": "^2.40.0",
"autosize": "^4.0.4",
"body-parser": "^1.19.0",
"browser-filesaver": "^1.1.1",
Expand Down
4 changes: 2 additions & 2 deletions client/sites-dashboard/components/sites-ellipsis-menu.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ const ManagePluginsItem = ( { site, recordTracks }: SitesMenuItemProps ) => {
has_manage_plugins_feature: hasManagePluginsFeature,
} )
}
info={ ! hasManagePluginsFeature && __( 'Requires a Business Plan' ) }
info={ ! hasManagePluginsFeature ? __( 'Requires a Business Plan' ) : undefined }
>
{ label }
</MenuItemLink>
Expand Down Expand Up @@ -327,7 +327,7 @@ function HostingConfigurationSubmenu( { site, recordTracks }: SitesMenuItemProps
product_slug: site.plan?.product_slug,
} }
/>
<MenuItemLink info={ displayUpsell && __( 'Requires a Business Plan' ) }>
<MenuItemLink info={ displayUpsell ? __( 'Requires a Business Plan' ) : undefined }>
{ __( 'Hosting configuration' ) } <MenuItemGridIcon icon="chevron-right" size={ 18 } />
</MenuItemLink>
<SubmenuPopover
Expand Down
Loading

0 comments on commit 8057900

Please sign in to comment.