Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump @wordpress/interface and other monorepo packages for Gutenberg 13.3.0 compat #64093

Merged
merged 9 commits into from
May 31, 2022
+988 −1,014
Merged

Bump @wordpress/interface and other monorepo packages for Gutenberg 13.3.0 compat #64093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
080df61
Bump @wordpress/interface for Gutenberg 13.3.0 compat
mattwiebe May 26, 2022
8fa3945
Add yarn.lock changes
fullofcaffeine May 26, 2022
812a1c8
Update @wordpress monorepo
fullofcaffeine May 26, 2022
f79d046
Resolve peer dep warnings
noahtallen May 26, 2022
3b522e6
Merge branch 'trunk' into fix/edit-site-loading-in-gutenberg-13.3.0
fullofcaffeine May 27, 2022
75990ab
fix peer deps
noahtallen May 27, 2022
6b61427
Merge branch 'trunk' into fix/edit-site-loading-in-gutenberg-13.3.0
fullofcaffeine May 30, 2022
408ceff
Pin the react-dates package to 17.1.1 to avoid the interopRequireDefa…
fullofcaffeine May 31, 2022
f72a39d
Merge branch 'trunk' into fix/edit-site-loading-in-gutenberg-13.3.0
fullofcaffeine May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,25 @@ logFilters:

# Depends on
# react-autosize-textarea: https://github.com/buildo/react-autosize-textarea/issues/149
- pattern: "wp-calypso@workspace:. provides react (p79163) with version 17.0.2, which doesn't satisfy what @types/wordpress__block-editor and some of its descendants request"
- pattern: "wp-calypso@workspace:. provides react (*) with version 17.0.2, which doesn't satisfy what @types/wordpress__block-editor and some of its descendants request"
level: discard
- pattern: "wp-calypso@workspace:. provides react-dom (pf5aa8) with version 17.0.2, which doesn't satisfy what @types/wordpress__block-editor and some of its descendants request"
- pattern: "wp-calypso@workspace:. provides react-dom (*) with version 17.0.2, which doesn't satisfy what @types/wordpress__block-editor and some of its descendants request"
level: discard
- pattern: "calypso@workspace:client provides react (pb0cb8) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
- pattern: "calypso@workspace:client provides react (*) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
level: discard
- pattern: "calypso@workspace:client provides react-dom (p20407) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
- pattern: "calypso@workspace:client provides react-dom (*) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
level: discard
- pattern: "@automattic/o2-blocks@workspace:apps/o2-blocks provides react (pb4b28) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
- pattern: "@automattic/o2-blocks@workspace:apps/o2-blocks provides react (*) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
level: discard
- pattern: "@automattic/o2-blocks@workspace:apps/o2-blocks provides react-dom (p7bb47) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
- pattern: "@automattic/o2-blocks@workspace:apps/o2-blocks provides react-dom (*) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
level: discard
- pattern: "@automattic/wpcom-block-editor@workspace:apps/wpcom-block-editor provides react (pf7761) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
- pattern: "@automattic/wpcom-block-editor@workspace:apps/wpcom-block-editor provides react (*) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
level: discard
- pattern: "@automattic/wpcom-block-editor@workspace:apps/wpcom-block-editor provides react-dom (pcf866) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
- pattern: "@automattic/wpcom-block-editor@workspace:apps/wpcom-block-editor provides react-dom (*) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
level: discard
- pattern: "@automattic/wpcom-editing-toolkit@workspace:apps/editing-toolkit provides react (p0736e) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
- pattern: "@automattic/wpcom-editing-toolkit@workspace:apps/editing-toolkit provides react (*) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
level: discard
- pattern: "@automattic/wpcom-editing-toolkit@workspace:apps/editing-toolkit provides react-dom (p68ba6) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
- pattern: "@automattic/wpcom-editing-toolkit@workspace:apps/editing-toolkit provides react-dom (*) with version 17.0.2, which doesn't satisfy what @wordpress/block-editor and some of its descendants request"
level: discard

# Depends on
Expand Down Expand Up @@ -177,11 +177,6 @@ packageExtensions:
react-dom: '*'
redux: '*'
reakit-utils: '*'
'@wordpress/[email protected]':
peerDependencies:
'@babel/core': '*'
react: '*'
react-dom: '*'
'@wordpress/[email protected]':
peerDependencies:
react: '*'
Expand Down
68 changes: 34 additions & 34 deletions apps/editing-toolkit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,38 +72,38 @@
"@popperjs/core": "^2.10.2",
"@sentry/browser": "^6.19.6",
"@sentry/tracing": "^6.19.6",
"@wordpress/a11y": "^3.7.0",
"@wordpress/api-fetch": "^6.4.0",
"@wordpress/base-styles": "^4.4.0",
"@wordpress/block-editor": "^8.6.0",
"@wordpress/blocks": "^11.6.0",
"@wordpress/components": "^19.9.0",
"@wordpress/compose": "^5.5.0",
"@wordpress/data": "^6.7.0",
"@wordpress/data-controls": "^2.7.0",
"@wordpress/date": "^4.7.0",
"@wordpress/dependency-extraction-webpack-plugin": "^3.4.1",
"@wordpress/dom-ready": "^3.7.0",
"@wordpress/edit-post": "^6.4.0",
"@wordpress/editor": "^12.6.0",
"@wordpress/element": "^4.5.0",
"@wordpress/env": "^4.6.0",
"@wordpress/escape-html": "^2.7.0",
"@wordpress/hooks": "^3.7.0",
"@wordpress/html-entities": "^3.7.0",
"@wordpress/i18n": "^4.7.0",
"@wordpress/icons": "^8.3.0",
"@wordpress/interface": "^4.6.0",
"@wordpress/is-shallow-equal": "^4.7.0",
"@wordpress/keycodes": "^3.7.0",
"@wordpress/nux": "^5.5.0",
"@wordpress/plugins": "^4.5.0",
"@wordpress/primitives": "^3.5.0",
"@wordpress/react-i18n": "^3.0.4",
"@wordpress/rich-text": "^5.5.0",
"@wordpress/scripts": "^22.5.0",
"@wordpress/server-side-render": "^3.5.0",
"@wordpress/url": "^3.8.0",
"@wordpress/a11y": "^3.9.0",
"@wordpress/api-fetch": "^6.6.0",
"@wordpress/base-styles": "^4.5.0",
"@wordpress/block-editor": "^9.1.0",
"@wordpress/blocks": "^11.8.0",
"@wordpress/components": "^19.11.0",
"@wordpress/compose": "^5.7.0",
"@wordpress/data": "^6.9.0",
"@wordpress/data-controls": "^2.9.0",
"@wordpress/date": "^4.9.0",
"@wordpress/dependency-extraction-webpack-plugin": "^3.5.0",
"@wordpress/dom-ready": "^3.9.0",
"@wordpress/edit-post": "^6.6.0",
"@wordpress/editor": "^12.8.0",
"@wordpress/element": "^4.7.0",
"@wordpress/env": "^4.7.0",
"@wordpress/escape-html": "^2.9.0",
"@wordpress/hooks": "^3.9.0",
"@wordpress/html-entities": "^3.9.0",
"@wordpress/i18n": "^4.9.0",
"@wordpress/icons": "^9.0.0",
"@wordpress/interface": "^4.8.0",
"@wordpress/is-shallow-equal": "^4.9.0",
"@wordpress/keycodes": "^3.9.0",
"@wordpress/nux": "^5.7.0",
"@wordpress/plugins": "^4.7.0",
"@wordpress/primitives": "^3.7.0",
"@wordpress/react-i18n": "^3.7.0",
"@wordpress/rich-text": "^5.7.0",
"@wordpress/scripts": "^23.1.0",
"@wordpress/server-side-render": "^3.7.0",
"@wordpress/url": "^3.10.0",
"calypso": "workspace:^",
"classnames": "^2.3.1",
"enzyme": "^3.11.0",
Expand All @@ -130,8 +130,8 @@
"@testing-library/react": "^12.1.3",
"@types/node": "^15.0.2",
"@types/wordpress__plugins": "^3.0.0",
"@wordpress/eslint-plugin": "^12.1.0",
"@wordpress/jest-preset-default": "^7.1.3",
"@wordpress/eslint-plugin": "^12.3.0",
"@wordpress/jest-preset-default": "^8.2.0",
"babel-jest": "^27.5.1",
"jest-teamcity": "^1.9.0",
"wait-for-expect": "^3.0.2",
Expand Down
24 changes: 12 additions & 12 deletions apps/o2-blocks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
},
"dependencies": {
"@automattic/calypso-build": "workspace:^",
"@wordpress/api-fetch": "^6.4.0",
"@wordpress/base-styles": "^4.4.0",
"@wordpress/block-editor": "^8.6.0",
"@wordpress/blocks": "^11.6.0",
"@wordpress/components": "^19.9.0",
"@wordpress/data": "^6.7.0",
"@wordpress/editor": "^12.6.0",
"@wordpress/element": "^4.5.0",
"@wordpress/hooks": "^3.7.0",
"@wordpress/i18n": "^4.7.0",
"@wordpress/is-shallow-equal": "^4.7.0",
"@wordpress/primitives": "^3.5.0",
"@wordpress/api-fetch": "^6.6.0",
"@wordpress/base-styles": "^4.5.0",
"@wordpress/block-editor": "^9.1.0",
"@wordpress/blocks": "^11.8.0",
"@wordpress/components": "^19.11.0",
"@wordpress/data": "^6.9.0",
"@wordpress/editor": "^12.8.0",
"@wordpress/element": "^4.7.0",
"@wordpress/hooks": "^3.9.0",
"@wordpress/i18n": "^4.9.0",
"@wordpress/is-shallow-equal": "^4.9.0",
"@wordpress/primitives": "^3.7.0",
"classnames": "^2.3.1",
"lodash": "^4.17.21",
"moment": "^2.26.0",
Expand Down
38 changes: 19 additions & 19 deletions apps/wpcom-block-editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@
"dependencies": {
"@automattic/typography": "workspace:^",
"@babel/runtime": "^7.17.2",
"@wordpress/base-styles": "^4.4.0",
"@wordpress/block-editor": "^8.6.0",
"@wordpress/blocks": "^11.6.0",
"@wordpress/components": "^19.9.0",
"@wordpress/compose": "^5.5.0",
"@wordpress/data": "^6.7.0",
"@wordpress/dom-ready": "^3.7.0",
"@wordpress/edit-post": "^6.4.0",
"@wordpress/edit-site": "^4.4.0",
"@wordpress/editor": "^12.6.0",
"@wordpress/element": "^4.5.0",
"@wordpress/hooks": "^3.7.0",
"@wordpress/i18n": "^4.7.0",
"@wordpress/icons": "^8.3.0",
"@wordpress/is-shallow-equal": "^4.7.0",
"@wordpress/plugins": "^4.5.0",
"@wordpress/rich-text": "^5.5.0",
"@wordpress/url": "^3.8.0",
"@wordpress/base-styles": "^4.5.0",
"@wordpress/block-editor": "^9.1.0",
"@wordpress/blocks": "^11.8.0",
"@wordpress/components": "^19.11.0",
"@wordpress/compose": "^5.7.0",
"@wordpress/data": "^6.9.0",
"@wordpress/dom-ready": "^3.9.0",
"@wordpress/edit-post": "^6.6.0",
"@wordpress/edit-site": "^4.6.0",
"@wordpress/editor": "^12.8.0",
"@wordpress/element": "^4.7.0",
"@wordpress/hooks": "^3.9.0",
"@wordpress/i18n": "^4.9.0",
"@wordpress/icons": "^9.0.0",
"@wordpress/is-shallow-equal": "^4.9.0",
"@wordpress/plugins": "^4.7.0",
"@wordpress/rich-text": "^5.7.0",
"@wordpress/url": "^3.10.0",
"debug": "^4.3.3",
"lodash": "^4.17.21",
"react": "^17.0.2",
Expand All @@ -53,7 +53,7 @@
"@automattic/calypso-apps-builder": "workspace:^",
"@automattic/calypso-build": "workspace:^",
"@automattic/calypso-eslint-overrides": "workspace:^",
"@wordpress/dependency-extraction-webpack-plugin": "^3.2.1",
"@wordpress/dependency-extraction-webpack-plugin": "^3.5.0",
"enzyme": "^3.11.0",
"jest": "^27.3.1",
"npm-run-all": "^4.1.5",
Expand Down
44 changes: 22 additions & 22 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,28 +66,28 @@
"@sentry/react": "^6.19.4",
"@stripe/react-stripe-js": "^1.4.1",
"@stripe/stripe-js": "^1.17.1",
"@wordpress/a11y": "^3.7.0",
"@wordpress/api-fetch": "^6.4.0",
"@wordpress/base-styles": "^4.4.0",
"@wordpress/block-editor": "^8.6.0",
"@wordpress/blocks": "^11.6.0",
"@wordpress/components": "^19.9.0",
"@wordpress/compose": "^5.5.0",
"@wordpress/data": "^6.7.0",
"@wordpress/data-controls": "^2.7.0",
"@wordpress/edit-post": "^6.4.0",
"@wordpress/element": "^4.5.0",
"@wordpress/format-library": "^3.5.0",
"@wordpress/hooks": "^3.7.0",
"@wordpress/i18n": "^4.7.0",
"@wordpress/icons": "^8.3.0",
"@wordpress/is-shallow-equal": "^4.7.0",
"@wordpress/keyboard-shortcuts": "^3.5.0",
"@wordpress/keycodes": "^3.7.0",
"@wordpress/react-i18n": "^3.0.4",
"@wordpress/url": "^3.8.0",
"@wordpress/viewport": "^4.5.0",
"@wordpress/warning": "^2.7.0",
"@wordpress/a11y": "^3.9.0",
"@wordpress/api-fetch": "^6.6.0",
"@wordpress/base-styles": "^4.5.0",
"@wordpress/block-editor": "^9.1.0",
"@wordpress/blocks": "^11.8.0",
"@wordpress/components": "^19.11.0",
"@wordpress/compose": "^5.7.0",
"@wordpress/data": "^6.9.0",
"@wordpress/data-controls": "^2.9.0",
"@wordpress/edit-post": "^6.6.0",
"@wordpress/element": "^4.7.0",
"@wordpress/format-library": "^3.7.0",
"@wordpress/hooks": "^3.9.0",
"@wordpress/i18n": "^4.9.0",
"@wordpress/icons": "^9.0.0",
"@wordpress/is-shallow-equal": "^4.9.0",
"@wordpress/keyboard-shortcuts": "^3.7.0",
"@wordpress/keycodes": "^3.9.0",
"@wordpress/react-i18n": "^3.7.0",
"@wordpress/url": "^3.10.0",
"@wordpress/viewport": "^4.7.0",
"@wordpress/warning": "^2.9.0",
"autosize": "^4.0.4",
"body-parser": "^1.19.0",
"browser-filesaver": "^1.1.1",
Expand Down
21 changes: 11 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,15 @@
"@types/wordpress__data": "^4.6.10",
"@types/wordpress__data-controls": "^2.2.0",
"@types/wordpress__editor": "^10.0.1",
"@wordpress/base-styles": "^4.4.0",
"@wordpress/components": "^19.9.0",
"@wordpress/data": "^6.7.0",
"@wordpress/element": "^4.5.0",
"@wordpress/i18n": "^4.7.0",
"@wordpress/icons": "^8.3.0",
"@wordpress/is-shallow-equal": "^4.7.0",
"@wordpress/jest-preset-default": "^8.1.1",
"@wordpress/url": "^3.8.0",
"@wordpress/base-styles": "^4.5.0",
"@wordpress/components": "^19.11.0",
"@wordpress/data": "^6.9.0",
"@wordpress/element": "^4.7.0",
"@wordpress/i18n": "^4.9.0",
"@wordpress/icons": "^9.0.0",
"@wordpress/is-shallow-equal": "^4.9.0",
"@wordpress/jest-preset-default": "^8.2.0",
"@wordpress/url": "^3.10.0",
"backstopjs": "5.1.0",
"browserslist": "^4.16.0",
"calypso": "workspace:^",
Expand Down Expand Up @@ -213,7 +213,7 @@
"@testing-library/jest-dom": "^5.16.2",
"@typescript-eslint/eslint-plugin": "^5.7.0",
"@typescript-eslint/parser": "^5.7.0",
"@wordpress/eslint-plugin": "^12.1.0",
"@wordpress/eslint-plugin": "^12.3.0",
"babel-loader": "^8.2.3",
"bunyan": "^1.8.15",
"capture-website": "^1.0.0",
Expand Down Expand Up @@ -278,6 +278,7 @@
"yargs": "^17.0.1"
},
"resolutions": {
"react-dates": "17.1.1",
"@automattic/newspack-blocks/[email protected]": "patch:[email protected]#.patches/[email protected]",
"@automattic/newspack-blocks/prettier": "npm:[email protected]",
"@types/react": "^17.0.39",
Expand Down
2 changes: 1 addition & 1 deletion packages/calypso-build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@babel/core": "^7.17.5",
"@types/webpack-env": "^1.16.3",
"@wordpress/browserslist-config": "^4.1.2",
"@wordpress/dependency-extraction-webpack-plugin": "^3.2.1",
"@wordpress/dependency-extraction-webpack-plugin": "^3.5.0",
"autoprefixer": "^10.2.5",
"babel-loader": "^8.2.3",
"browserslist": "^4.8.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/calypso-e2e/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@types/jest": "^27.4.0",
"@types/node": "^16.11.26",
"@types/node-fetch": "^2.6.1",
"@wordpress/i18n": "^4.2.4",
"@wordpress/i18n": "^4.9.0",
"asana-phrase": "^0.0.8",
"node-fetch": "^2.6.6",
"typescript": "^4.5.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"@automattic/calypso-url": "workspace:^",
"@automattic/data-stores": "workspace:^",
"@wordpress/base-styles": "^4.4.0",
"@wordpress/base-styles": "^4.5.0",
"classnames": "^2.3.1",
"gridicons": "^3.4.0",
"i18n-calypso": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/composite-checkout/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"dependencies": {
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@wordpress/i18n": "^4.7.0",
"@wordpress/react-i18n": "^3.0.4",
"@wordpress/i18n": "^4.9.0",
"@wordpress/react-i18n": "^3.7.0",
"debug": "^4.3.3",
"prop-types": "^15.7.2"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/data-stores/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"dependencies": {
"@automattic/format-currency": "workspace:^",
"@automattic/happychat-connection": "workspace:^",
"@wordpress/api-fetch": "^6.4.0",
"@wordpress/data-controls": "^2.7.0",
"@wordpress/deprecated": "^3.7.0",
"@wordpress/url": "^3.8.0",
"@wordpress/api-fetch": "^6.6.0",
"@wordpress/data-controls": "^2.9.0",
"@wordpress/deprecated": "^3.9.0",
"@wordpress/url": "^3.10.0",
"fast-json-stable-stringify": "^2.1.0",
"i18n-calypso": "workspace:^",
"qs": "^6.9.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/design-picker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"@automattic/js-utils": "workspace:^",
"@automattic/onboarding": "workspace:^",
"@automattic/typography": "workspace:^",
"@wordpress/components": "^19.9.0",
"@wordpress/react-i18n": "^3.0.4",
"@wordpress/url": "^3.8.0",
"@wordpress/components": "^19.11.0",
"@wordpress/react-i18n": "^3.7.0",
"@wordpress/url": "^3.10.0",
"classnames": "^2.3.1",
"react-query": "^3.32.1",
"tslib": "^2.3.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/domain-picker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"@automattic/i18n-utils": "workspace:^",
"@automattic/onboarding": "workspace:^",
"@automattic/typography": "workspace:^",
"@wordpress/base-styles": "^4.4.0",
"@wordpress/components": "^19.9.0",
"@wordpress/compose": "^5.5.0",
"@wordpress/icons": "^8.3.0",
"@wordpress/react-i18n": "^3.0.4",
"@wordpress/base-styles": "^4.5.0",
"@wordpress/components": "^19.11.0",
"@wordpress/compose": "^5.7.0",
"@wordpress/icons": "^9.0.0",
"@wordpress/react-i18n": "^3.7.0",
"classnames": "^2.3.1",
"lodash": "^4.17.21",
"tslib": "^2.3.0",
Expand Down
Loading