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.

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

Upgrade TypeScript to 5.7 and fix types #67461

Merged
merged 6 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
"style-loader": "3.2.1",
"terser": "5.32.0",
"terser-webpack-plugin": "5.3.10",
"typescript": "5.5.3",
"typescript": "5.7.2",
"uuid": "9.0.1",
"webdriverio": "8.16.20",
"webpack": "5.95.0",
Expand Down
4 changes: 3 additions & 1 deletion packages/components/src/dropdown-menu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ function UnconnectedDropdownMenu( dropdownMenuProps: DropdownMenuProps ) {
indexOfSet,
indexOfControl,
].join() }
onClick={ ( event ) => {
onClick={ (
event: React.MouseEvent< HTMLButtonElement >
) => {
event.stopPropagation();
props.onClose();
if ( control.onClick ) {
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/modal/test/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,8 @@ describe( 'Modal', () => {
} );

describe( 'Focus handling', () => {
let originalGetClientRects: () => DOMRectList;
const originalGetClientRects =
window.HTMLElement.prototype.getClientRects;

const FocusMountDemo = ( {
focusOnMount,
Expand Down
6 changes: 5 additions & 1 deletion packages/components/src/tree-grid/cell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ function UnforwardedTreeGridCell(
return (
<td { ...props } role="gridcell">
{ withoutGridItem ? (
<>{ children }</>
<>
{ typeof children === 'function'
? children( { ...props, ref } )
: children }
</>
) : (
<TreeGridItem ref={ ref }>{ children }</TreeGridItem>
) }
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/tree-grid/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export type TreeGridRowProps = {
type RovingTabIndexItemPassThruProps = {
ref: React.ForwardedRef< any >;
tabIndex?: number;
onFocus: React.FocusEventHandler< any >;
onFocus?: React.FocusEventHandler< any >;
[ key: string ]: any;
};

Expand Down
13 changes: 9 additions & 4 deletions packages/eslint-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Breaking Changes

- The minimum required TypeScript version changed to 5 ([#67461](https://github.com/WordPress/gutenberg/pull/67461))

## 21.6.0 (2024-11-27)

## 21.5.0 (2024-11-16)
Expand All @@ -18,8 +22,8 @@

### Breaking Changes

- Add [`@wordpress/i18n-no-flanking-whitespace`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/eslint-plugin/docs/rules/i18n-no-flanking-whitespace.md) to the recommended i18n ruleset ([#64710](https://github.com/WordPress/gutenberg/pull/64710).
- Add [`@wordpress/i18n-hyphenated-range`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/eslint-plugin/docs/rules/i18n-hyphenated-range.md) to the recommended i18n ruleset ([#64710](https://github.com/WordPress/gutenberg/pull/64710).
- Add [`@wordpress/i18n-no-flanking-whitespace`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/eslint-plugin/docs/rules/i18n-no-flanking-whitespace.md) to the recommended i18n ruleset ([#64710](https://github.com/WordPress/gutenberg/pull/64710).
- Add [`@wordpress/i18n-hyphenated-range`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/eslint-plugin/docs/rules/i18n-hyphenated-range.md) to the recommended i18n ruleset ([#64710](https://github.com/WordPress/gutenberg/pull/64710).

## 20.3.0 (2024-08-21)

Expand All @@ -30,8 +34,9 @@
## 20.0.0 (2024-07-10)

### Breaking Changes
- Add [`@typescript-eslint/no-unused-vars` rule](https://typescript-eslint.io/rules/no-unused-vars) to the recommended TypeScript ruleset ([#62925](https://github.com/WordPress/gutenberg/pull/62925)).
- Add [`@typescript-eslint/method-signature-style` rule](https://typescript-eslint.io/rules/method-signature-style) to the recommended TypeScript ruleset ([#62718](https://github.com/WordPress/gutenberg/pull/62718)).

- Add [`@typescript-eslint/no-unused-vars` rule](https://typescript-eslint.io/rules/no-unused-vars) to the recommended TypeScript ruleset ([#62925](https://github.com/WordPress/gutenberg/pull/62925)).
- Add [`@typescript-eslint/method-signature-style` rule](https://typescript-eslint.io/rules/method-signature-style) to the recommended TypeScript ruleset ([#62718](https://github.com/WordPress/gutenberg/pull/62718)).

## 19.2.0 (2024-06-26)

Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@babel/core": ">=7",
"eslint": ">=8",
"prettier": ">=3",
"typescript": ">=4"
"typescript": ">=5"
},
"peerDependenciesMeta": {
"prettier": {
Expand Down
13 changes: 13 additions & 0 deletions packages/rich-text/src/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ export class RichTextData {
static fromHTMLString( html ) {
return new RichTextData( create( { html } ) );
}
/**
* Create a RichTextData instance from an HTML element.
*
* @param {HTMLElement} htmlElement The HTML element to create the instance from.
* @param {{preserveWhiteSpace?: boolean}} options Options.
* @return {RichTextData} The RichTextData instance.
*/
static fromHTMLElement( htmlElement, options = {} ) {
const { preserveWhiteSpace = false } = options;
const element = preserveWhiteSpace
Expand All @@ -144,6 +151,12 @@ export class RichTextData {
}
// We could expose `toHTMLElement` at some point as well, but we'd only use
// it internally.
/**
* Convert the rich text value to an HTML string.
*
* @param {{preserveWhiteSpace?: boolean}} options Options.
* @return {string} The HTML string.
*/
toHTMLString( { preserveWhiteSpace } = {} ) {
return (
this.originalHTML ||
Expand Down
2 changes: 0 additions & 2 deletions packages/router/src/router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ export function useHistory() {
window.matchMedia( '(min-width: 782px)' ).matches;
if (
! isMediumOrBigger ||
// @ts-expect-error
! document.startViewTransition ||
! options.transition
) {
Expand All @@ -131,7 +130,6 @@ export function useHistory() {
await new Promise< void >( ( resolve ) => {
const classname = options.transition ?? '';
document.documentElement.classList.add( classname );
// @ts-expect-error
const transition = document.startViewTransition( () =>
performPush()
);
Expand Down
4 changes: 2 additions & 2 deletions packages/vips/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ _Parameters_

_Returns_

- `Promise< ArrayBuffer >`: Compressed file data.
- `Promise< ArrayBuffer | ArrayBufferLike >`: Compressed file data.

### convertImageFormat

Expand Down Expand Up @@ -83,7 +83,7 @@ _Parameters_

_Returns_

- `Promise< { buffer: ArrayBuffer; width: number; height: number; originalWidth: number; originalHeight: number; } >`: Processed file data plus the old and new dimensions.
- `Promise< { buffer: ArrayBuffer | ArrayBufferLike; width: number; height: number; originalWidth: number; originalHeight: number; } >`: Processed file data plus the old and new dimensions.

### setLocation

Expand Down
6 changes: 3 additions & 3 deletions packages/vips/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export async function convertImageFormat(
outputType: string,
quality = 0.82,
interlaced = false
): Promise< ArrayBuffer > {
): Promise< ArrayBuffer | ArrayBufferLike > {
const ext = outputType.split( '/' )[ 1 ];

inProgressOperations.add( id );
Expand Down Expand Up @@ -186,7 +186,7 @@ export async function compressImage(
type: string,
quality = 0.82,
interlaced = false
): Promise< ArrayBuffer > {
): Promise< ArrayBuffer | ArrayBufferLike > {
return convertImageFormat( id, buffer, type, type, quality, interlaced );
}

Expand All @@ -207,7 +207,7 @@ export async function resizeImage(
resize: ImageSizeCrop,
smartCrop = false
): Promise< {
buffer: ArrayBuffer;
buffer: ArrayBuffer | ArrayBufferLike;
width: number;
height: number;
originalWidth: number;
Expand Down
Loading