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

fix(deps): update wordpress monorepo #57217

Merged
merged 10 commits into from
Nov 19, 2021
Merged

fix(deps): update wordpress monorepo #57217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1629485
fix(deps): update wordpress monorepo
renovate-bot Nov 8, 2021
9c64b81
Fixes yarn warnings about peer dependencies
scinos Nov 8, 2021
42c28f9
Fix tests that require jsdom environment
scinos Nov 8, 2021
97f1a6f
Use `sass:math`
scinos Nov 8, 2021
fae4cbb
Update @automattic/isolated-block-editor
noahtallen Nov 12, 2021
084e6f5
Dedupe packages
scinos Nov 17, 2021
86118cf
Mount ShortcutProvider to avoid useShortcut crash
jsnajdr Nov 18, 2021
7a96a2e
Resolve TODO related to wordpress styles
noahtallen Nov 18, 2021
a8de17d
Declare types for wp/keyboard-shortcuts
noahtallen Nov 18, 2021
9ea4562
Remove comments
scinos Nov 19, 2021
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
103 changes: 46 additions & 57 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ logFilters:
# react-autosize-textarea: https://github.com/buildo/react-autosize-textarea/issues/149
# react-dates: https://github.com/airbnb/react-dates/issues/2105
# react-with-direction: https://github.com/airbnb/react-with-direction/issues/20
- pattern: "calypso@workspace:client provides react (p06893) with version 17.0.2, which doesn't satisfy what @automattic/isolated-block-editor and some of its descendants request"
- pattern: "calypso@workspace:client provides react (pe6f5d) with version 17.0.2, which doesn't satisfy what @automattic/isolated-block-editor and some of its descendants request"
level: discard

# Depends on
Expand All @@ -33,7 +33,7 @@ logFilters:
# react-autosize-textarea: https://github.com/buildo/react-autosize-textarea/issues/149
# react-dates: https://github.com/airbnb/react-dates/issues/2105
# react-with-direction: https://github.com/airbnb/react-with-direction/issues/20
- pattern: "calypso@workspace:client provides react-dom (p39753) with version 17.0.2, which doesn't satisfy what @automattic/isolated-block-editor and some of its descendants request"
- pattern: "calypso@workspace:client provides react-dom (pb67b8) with version 17.0.2, which doesn't satisfy what @automattic/isolated-block-editor and some of its descendants request"
level: discard

# Depends on
Expand All @@ -47,13 +47,13 @@ logFilters:
# airbnb-prop-types: https://github.com/airbnb/prop-types/issues/73
# react-dates: https://github.com/airbnb/react-dates/issues/2105
# react-with-direction: https://github.com/airbnb/react-with-direction/issues/20
- pattern: "wp-calypso@workspace:. provides react (pe19ec) with version 17.0.2, which doesn't satisfy what @wordpress/components and some of its descendants request"
- pattern: "wp-calypso@workspace:. provides react (pc457e) with version 17.0.2, which doesn't satisfy what @wordpress/components and some of its descendants request"
level: discard

# Depends on
# react-dates: https://github.com/airbnb/react-dates/issues/2105
# react-with-direction: https://github.com/airbnb/react-with-direction/issues/20
- pattern: "wp-calypso@workspace:. provides react-dom (pf9495) with version 17.0.2, which doesn't satisfy what @wordpress/components and some of its descendants request"
- pattern: "wp-calypso@workspace:. provides react-dom (pdf37b) with version 17.0.2, which doesn't satisfy what @wordpress/components and some of its descendants request"
level: discard

# Depends on
Expand All @@ -71,6 +71,13 @@ logFilters:
- pattern: "wp-calypso@workspace:. provides react-dom (pff688) with version 17.0.2, which doesn't satisfy what @automattic/components and some of its descendants request"
level: discard

# `postinstall` script fails (https://github.com/pmndrs/react-spring/issues/1668)
# Fixed in https://github.com/yarnpkg/berry/pull/3661, we need for a new yarn release.
# Work around it by disabling scripts for this package (see `dependenciesMeta` in `package.json`). The workaround can be removed
# once we have a Yarn version with the fix.
- pattern: '@react-spring/core@npm:9.3.0 [3ac30] lists build scripts, but its build has been explicitly disabled through configuration.'
level: discard

nodeLinker: node-modules

packageExtensions:
Expand Down Expand Up @@ -119,38 +126,33 @@ packageExtensions:
'@types/[email protected]':
peerDependencies:
react: '*'
'@wordpress/[email protected].3':
'@wordpress/[email protected].6':
peerDependencies:
redux: '*'
react: '*'
'@wordpress/[email protected]':
peerDependencies:
react-native: '*'
'@wordpress/[email protected]':
peerDependencies:
react-native: '*'
'@wordpress/[email protected]':
'@wordpress/[email protected]':
peerDependencies:
react: '*'
react-dom: '*'
react-native: '*'
redux: '*'
reakit-utils: '*'
'@wordpress/block-library@5.0.1':
'@wordpress/block-editor@8.0.1':
peerDependencies:
react: '*'
react-dom: '*'
react-native: '*'
redux: '*'
reakit-utils: '*'
'@wordpress/[email protected].0':
'@wordpress/[email protected].5':
peerDependencies:
react: '*'
react-dom: '*'
react-native: '*'
redux: '*'
reakit-utils: '*'
'@wordpress/[email protected].0':
'@wordpress/[email protected].3':
peerDependencies:
react: '*'
redux: '*'
Expand All @@ -160,144 +162,126 @@ packageExtensions:
react: '*'
react-dom: '*'
react-native: '*'
'@wordpress/components@16.0.0':
'@wordpress/components@18.0.0':
peerDependencies:
'@wordpress/data': '*'
react: '*'
react-dom: '*'
react-native: '*'
redux: '*'
'@wordpress/components@17.0.0':
'@wordpress/components@19.0.1':
peerDependencies:
react: '*'
react-dom: '*'
redux: '*'
'@wordpress/[email protected]':
peerDependencies:
react: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].5':
peerDependencies:
react: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].6':
peerDependencies:
react: '*'
react-native: '*'
redux: '*'
'@wordpress/[email protected].3':
'@wordpress/[email protected].6':
peerDependencies:
react: '*'
react-native: '*'
redux: '*'
'@wordpress/[email protected]':
peerDependencies:
react: '*'
'@wordpress/[email protected].0':
'@wordpress/[email protected].3':
peerDependencies:
react: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].7':
peerDependencies:
react: '*'
react-dom: '*'
react-native: '*'
redux: '*'
reakit-utils: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].5':
peerDependencies:
react: '*'
react-dom: '*'
react-native: '*'
reakit-utils: '*'
redux: '*'
'@wordpress/editor@11.0.2':
'@wordpress/editor@12.0.4':
peerDependencies:
react: '*'
react-dom: '*'
react-native: '*'
redux: '*'
reakit-utils: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].7':
peerDependencies:
react: '*'
react-dom: '*'
reakit-utils: '*'
redux: '*'
react-native: '*'
'@wordpress/[email protected]':
'@wordpress/[email protected]':
peerDependencies:
react: '*'
react-dom: '*'
react-native: '*'
redux: '*'
reakit-utils: '*'
'@wordpress/[email protected].1':
'@wordpress/[email protected].2':
peerDependencies:
'@babel/core': '*'
react: '*'
react-dom: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].5':
peerDependencies:
redux: '*'
react: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].5':
peerDependencies:
react: '*'
react-dom: '*'
reakit-utils: '*'
react-native: '*'
redux: '*'
'@wordpress/[email protected]':
peerDependencies:
react-native: '*'
'@wordpress/[email protected]':
'@wordpress/[email protected]':
peerDependencies:
react: '*'
redux: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].5':
peerDependencies:
react: '*'
react-dom: '*'
react-native: '*'
redux: '*'
reakit-utils: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].5':
peerDependencies:
react: '*'
'@wordpress/[email protected].1':
'@wordpress/[email protected].4':
peerDependencies:
postcss: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].7':
peerDependencies:
react: '*'
react-dom: '*'
react-native: '*'
reakit-utils: '*'
redux: '*'
'@wordpress/[email protected]':
peerDependencies:
react: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].5':
peerDependencies:
react: '*'
redux: '*'
'@wordpress/scripts@18.0.1':
'@wordpress/scripts@19.1.0':
peerDependencies:
'@babel/core': '*'
react: '*'
react-dom: '*'
'@wordpress/[email protected].2':
'@wordpress/[email protected].5':
peerDependencies:
react: '*'
react-dom: '*'
react-native: '*'
reakit-utils: '*'
redux: '*'
'@wordpress/[email protected]':
peerDependencies:
react-native: '*'
'@wordpress/[email protected]':
peerDependencies:
react-native: '*'
'@wordpress/[email protected]':
'@wordpress/[email protected]':
peerDependencies:
react: '*'
redux: '*'
Expand All @@ -321,13 +305,18 @@ packageExtensions:
peerDependenciesMeta:
webpack:
optional: true
'@automattic/isolated-block-editor@2.4.1':
'@automattic/isolated-block-editor@2.6.0':
peerDependencies:
# '@wp-g2/create-styles': '*'
react: '*'
react-dom: '*'
redux: '*'
react-native: '*'
dependencies:
# Note: isolated block editor already declares this as a dev dep, but since
# an eslint plugin is a proper dependency, it doesn't think the dev dep exists.
# Can be removed once https://github.com/Automattic/isolated-block-editor/pull/88
# is merged and released.
eslint: '*'
[email protected]:
peerDependencies:
react: '*'
Expand Down
60 changes: 30 additions & 30 deletions apps/editing-toolkit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,37 +63,37 @@
"@babel/core": "^7.16.0",
"@emotion/react": "^11.4.1",
"@popperjs/core": "^2.10.2",
"@wordpress/a11y": "^3.2.2",
"@wordpress/api-fetch": "^5.2.2",
"@wordpress/base-styles": "^4.0.0",
"@wordpress/block-editor": "^7.0.2",
"@wordpress/blocks": "^11.1.0",
"@wordpress/components": "^17.0.0",
"@wordpress/compose": "^5.0.2",
"@wordpress/data": "^6.1.0",
"@wordpress/data-controls": "^2.2.3",
"@wordpress/date": "^4.2.1",
"@wordpress/a11y": "^3.2.3",
"@wordpress/api-fetch": "^5.2.5",
"@wordpress/base-styles": "^4.0.3",
"@wordpress/block-editor": "^8.0.0",
"@wordpress/blocks": "^11.1.3",
"@wordpress/components": "^19.0.1",
"@wordpress/compose": "^5.0.5",
"@wordpress/data": "^6.1.3",
"@wordpress/data-controls": "^2.2.6",
"@wordpress/date": "^4.2.2",
"@wordpress/dependency-extraction-webpack-plugin": "^3.2.1",
"@wordpress/dom-ready": "^3.2.1",
"@wordpress/edit-post": "^5.0.2",
"@wordpress/editor": "^11.0.2",
"@wordpress/element": "^4.0.1",
"@wordpress/env": "^4.1.1",
"@wordpress/escape-html": "^2.2.1",
"@wordpress/hooks": "^3.2.0",
"@wordpress/html-entities": "^3.2.1",
"@wordpress/i18n": "^4.2.2",
"@wordpress/icons": "^5.0.2",
"@wordpress/dom-ready": "^3.2.2",
"@wordpress/edit-post": "^5.0.5",
"@wordpress/editor": "^12.0.2",
"@wordpress/element": "^4.0.3",
"@wordpress/env": "^4.1.3",
"@wordpress/escape-html": "^2.2.2",
"@wordpress/hooks": "^3.2.1",
"@wordpress/html-entities": "^3.2.2",
"@wordpress/i18n": "^4.2.3",
"@wordpress/icons": "^6.1.0",
"@wordpress/is-shallow-equal": "^4.2.0",
"@wordpress/keycodes": "^3.2.2",
"@wordpress/nux": "^5.0.2",
"@wordpress/plugins": "^4.0.2",
"@wordpress/primitives": "^3.0.1",
"@wordpress/react-i18n": "^3.0.1",
"@wordpress/rich-text": "^5.0.2",
"@wordpress/scripts": "^18.0.1",
"@wordpress/server-side-render": "^3.0.2",
"@wordpress/url": "3.2.2",
"@wordpress/keycodes": "^3.2.3",
"@wordpress/nux": "^5.0.5",
"@wordpress/plugins": "^4.0.5",
"@wordpress/primitives": "^3.0.3",
"@wordpress/react-i18n": "^3.0.3",
"@wordpress/rich-text": "^5.0.5",
"@wordpress/scripts": "^19.1.0",
"@wordpress/server-side-render": "^3.0.5",
"@wordpress/url": "3.3.0",
"classnames": "^2.3.1",
"enzyme": "^3.11.0",
"eslint": "^7.32.0",
Expand All @@ -117,7 +117,7 @@
"@testing-library/react": "^12.1.2",
"@types/node": "^15.0.2",
"@types/wordpress__plugins": "^3.0.0",
"@wordpress/eslint-plugin": "^9.1.2",
"@wordpress/eslint-plugin": "^9.2.0",
"babel-jest": "^26.6.3",
"wait-for-expect": "^3.0.2",
"webpack": "^5.64.1"
Expand Down
22 changes: 11 additions & 11 deletions apps/o2-blocks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
},
"dependencies": {
"@automattic/calypso-build": "workspace:^",
"@wordpress/api-fetch": "^5.2.2",
"@wordpress/base-styles": "^4.0.0",
"@wordpress/block-editor": "^7.0.2",
"@wordpress/blocks": "^11.1.0",
"@wordpress/components": "^17.0.0",
"@wordpress/data": "^6.1.0",
"@wordpress/editor": "^11.0.2",
"@wordpress/element": "^4.0.1",
"@wordpress/hooks": "^3.2.0",
"@wordpress/i18n": "^4.2.2",
"@wordpress/api-fetch": "^5.2.5",
"@wordpress/base-styles": "^4.0.3",
"@wordpress/block-editor": "^8.0.0",
"@wordpress/blocks": "^11.1.3",
"@wordpress/components": "^19.0.1",
"@wordpress/data": "^6.1.3",
"@wordpress/editor": "^12.0.2",
"@wordpress/element": "^4.0.3",
"@wordpress/hooks": "^3.2.1",
"@wordpress/i18n": "^4.2.3",
"@wordpress/is-shallow-equal": "^4.2.0",
"@wordpress/primitives": "^3.0.1",
"@wordpress/primitives": "^3.0.3",
"classnames": "^2.3.1",
"lodash": "^4.17.21",
"moment": "^2.26.0",
Expand Down
Loading