Skip to content

Commit bc007f1

Browse files
manzoorwanijkMamaduka
authored and
widoz
committed
Fix peer dependency conflicts left in the lockfile (WordPress#83754)
* Update re-resizable and use-memo-one to versions supporting React 18 Both packages had React peer ranges that excluded the installed React 18, left over from the legacy-peer-deps era. * Update typescript-eslint to a version supporting TypeScript 6.0 typescript-eslint 8.57 declares a TypeScript peer range below 6.0, while the repository resolves TypeScript 6.0.2. * Place packages next to the peer versions they require The lockfile carried hoisting from the legacy-peer-deps era that npm keeps as long as the entries satisfy their dependents: packages with peer ranges sat at the root beside incompatible peers. Move them under their dependents, where compatible peers already live, and declare the @terrazzo/cli peer. * Add PR link to changelog entries * Align @typescript-eslint/parser range in test/unit * Storybook: Add ResizableBox gridGap prop from re-resizable to the manifest * Pin typescript-eslint to 8.60.0 8.60.1 aligned @typescript-eslint/no-shadow with ESLint 10, which reports named function expressions passed to forwardRef or memo. 8.60.0 already accepts TypeScript 6.0. Co-authored-by: manzoorwanijk <manzoorwanijk@git.wordpress.org> Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
1 parent 00a38c6 commit bc007f1

13 files changed

Lines changed: 1408 additions & 1243 deletions

File tree

‎package-lock.json‎

Lines changed: 1386 additions & 1236 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/components/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
- `CardDivider`: Apply the Card's width, display, and border color consistently inside iframes ([#82577](https://github.com/WordPress/gutenberg/pull/82577)).
2121
- `BorderControl`, `BorderBoxControl`: Stop offering `%` as a width unit, since `border-width` does not accept percentages. A width already set in `%` keeps showing its unit ([#83492](https://github.com/WordPress/gutenberg/pull/83492)).
2222
- `UnitControl`: After clearing a value whose unit is not in `units`, give the next typed value the unit shown in the select instead of the cleared one ([#83492](https://github.com/WordPress/gutenberg/pull/83492)).
23+
- `ResizableBox`: Update `re-resizable` to `6.11.2`, which supports React 18 and renders the top and left handles before the content so focus order matches visual order ([#83754](https://github.com/WordPress/gutenberg/pull/83754)).
2324

2425
### Internal
2526

‎packages/components/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"is-plain-object": "^5.1.0",
9696
"memize": "^2.1.1",
9797
"path-to-regexp": "^6.2.1",
98-
"re-resizable": "^6.4.0",
98+
"re-resizable": "^6.11.2",
9999
"react-colorful": "^5.6.1",
100100
"remove-accents": "^0.5.0",
101101
"uuid": "^14.0.0"

‎packages/compose/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"@wordpress/undo-manager": "file:../undo-manager",
5656
"change-case": "^4.1.2",
5757
"mousetrap": "^1.6.5",
58-
"use-memo-one": "^1.1.1"
58+
"use-memo-one": "^1.1.3"
5959
},
6060
"devDependencies": {
6161
"@testing-library/dom": "^10.4.2",

‎packages/dataviews/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"memize": "^2.1.1",
9090
"react-colorful": "^5.6.1",
9191
"remove-accents": "^0.5.0",
92-
"use-memo-one": "^1.1.1",
92+
"use-memo-one": "^1.1.3",
9393
"uuid": "^14.0.0"
9494
},
9595
"devDependencies": {

‎packages/eslint-plugin/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
- `use-recommended-components`: Add an `allowUseWithCaution` option that allows `@wordpress/ui` components marked "Use with caution" ([#83536](https://github.com/WordPress/gutenberg/pull/83536)).
88

9+
### Bug Fixes
10+
11+
- Pin `typescript-eslint` to `8.60.0`, whose peer range includes TypeScript 6.0. Later versions report `const Foo = forwardRef( function Foo() {} )` under `@typescript-eslint/no-shadow` ([#83754](https://github.com/WordPress/gutenberg/pull/83754)).
12+
913
## 27.0.0 (2026-09-23)
1014

1115
### Breaking Changes

‎packages/eslint-plugin/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@
5858
"eslint-plugin-react-hooks": "^7.1.1",
5959
"globals": "^16.0.0",
6060
"requireindex": "^1.2.0",
61-
"typescript-eslint": "^8.57.1"
61+
"typescript-eslint": "8.60.0"
6262
},
6363
"devDependencies": {
6464
"@types/eslint": "^9",
6565
"@types/estree": "^1.0.8",
66-
"@typescript-eslint/parser": "^8.68.0",
66+
"@typescript-eslint/parser": "8.60.0",
6767
"eslint": "^10.0.0",
6868
"typescript": "npm:@typescript/typescript6@^6.0.2",
6969
"vitest": "^5.0.0"

‎packages/theme/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
"devDependencies": {
9898
"@storybook/addon-docs": "^10.5.3",
9999
"@storybook/react-vite": "^10.5.3",
100+
"@terrazzo/cli": "^2.7.1",
100101
"@terrazzo/parser": "^2.7.1",
101102
"@terrazzo/plugin-css": "^2.7.1",
102103
"@terrazzo/token-tools": "^2.7.1",

‎storybook/components-manifest.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,7 @@
10381038
- defaultSize
10391039
- enable
10401040
- grid
1041+
- gridGap
10411042
- handleClasses
10421043
- handleComponent
10431044
- handleStyles

‎storybook/prop-description-allowlist.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
"ResizableBox:defaultSize",
5555
"ResizableBox:enable",
5656
"ResizableBox:grid",
57+
"ResizableBox:gridGap",
5758
"ResizableBox:handleClasses",
5859
"ResizableBox:handleComponent",
5960
"ResizableBox:handleStyles",

0 commit comments

Comments
 (0)