@wordpress/eslint-plugin 17.13.0 → 18.1.0

package/configs/react.js

@@ -37,7 +37,7 @@ module.exports = {
 		'react-hooks/exhaustive-deps': [
 			'warn',
 			{
-				additionalHooks: '(useSelect|useSuspenseSelect)',
+				additionalHooks: '^(useSelect|useSuspenseSelect)$',
 			},
 		],
 		'react-hooks/rules-of-hooks': 'error',

package/configs/recommended.js

@@ -25,6 +25,12 @@ if ( isPackageInstalled( 'prettier' ) ) {
 	const prettierConfig = { ...defaultPrettierConfig, ...localPrettierConfig };
 	config.rules = {
 		'prettier/prettier': [ 'error', prettierConfig ],
+		// Prettier _disables_ this rule, but we want it!
+		// See https://github.com/prettier/eslint-config-prettier?tab=readme-ov-file#curly
+		// > This rule requires certain options.
+		// > …
+		// > If you like this rule, it can be used just fine with Prettier as long as you don’t use the "multi-line" or "multi-or-nest" option.
+		curly: [ 'error', 'all' ],
 	};
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/eslint-plugin",
-	"version": "17.13.0",
+	"version": "18.1.0",
 	"description": "ESLint plugin for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -34,8 +34,8 @@
 		"@babel/eslint-parser": "^7.16.0",
 		"@typescript-eslint/eslint-plugin": "^6.4.1",
 		"@typescript-eslint/parser": "^6.4.1",
-		"@wordpress/babel-preset-default": "^7.40.0",
-		"@wordpress/prettier-config": "^3.13.0",
+		"@wordpress/babel-preset-default": "^7.42.0",
+		"@wordpress/prettier-config": "^3.15.0",
 		"cosmiconfig": "^7.0.0",
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-import": "^2.25.2",
@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "280403b4c1cf6cc2c55a6c4d56f9ef91145e4191"
+	"gitHead": "42f38f287506a6b3ed8ccba839b18ad066821044"
 }

package/rules/__tests__/dependency-group.js

@@ -23,7 +23,7 @@ ruleTester.run( 'dependency-group', rule, {
  * External dependencies
  */
 import { camelCase } from 'change-case';
-import classnames from 'classnames';
+import clsx from 'clsx';;
 
 /**
  * WordPress dependencies
@@ -41,7 +41,7 @@ import edit from './edit';`,
  * External dependencies
  */
 const { camelCase } = require( 'change-case' );
-const classnames = require( 'classnames' );
+const clsx = require( 'clsx' );
 
 /**
  * WordPress dependencies
@@ -58,7 +58,7 @@ const edit = require( './edit' );`,
 		{
 			code: `
 import { camelCase } from 'change-case';
-import classnames from 'classnames';
+import clsx from 'clsx';;
 /*
  * wordpress dependencies.
  */
@@ -83,7 +83,7 @@ import edit from './edit';`,
  * External dependencies
  */
 import { camelCase } from 'change-case';
-import classnames from 'classnames';
+import clsx from 'clsx';;
 /**
  * WordPress dependencies
  */
@@ -96,7 +96,7 @@ import edit from './edit';`,
 		{
 			code: `
 const { camelCase } = require( 'change-case' );
-const classnames = require( 'classnames' );
+const clsx = require( 'clsx' );
 /*
  * wordpress dependencies.
  */
@@ -121,7 +121,7 @@ const edit = require( './edit' );`,
  * External dependencies
  */
 const { camelCase } = require( 'change-case' );
-const classnames = require( 'classnames' );
+const clsx = require( 'clsx' );
 /**
  * WordPress dependencies
  */

package/rules/__tests__/i18n-translator-comments.js

@@ -34,6 +34,23 @@ sprintf(
 // translators: %s: Color
 i18n.sprintf( i18n.__( 'Color: %s' ), color );`,
 		},
+		{
+			code: `
+sprintf(
+	/*
+	 * translators: %s is the name of the city we couldn't locate.
+	 * Replace the examples with cities related to your locale. Test that
+	 * they match the expected location and have upcoming events before
+	 * including them. If no cities related to your locale have events,
+	 * then use cities related to your locale that would be recognizable
+	 * to most users. Use only the city name itself, without any region
+	 * or country. Use the endonym (native locale name) instead of the
+	 * English name if possible.
+	 */
+	__( 'We couldn’t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
+templateParams.unknownCity
+);`,
+		},
 	],
 	invalid: [
 		{

package/rules/i18n-translator-comments.js

@@ -78,7 +78,7 @@ module.exports = {
 					const {
 						value: commentText,
 						loc: {
-							start: { line: commentLine },
+							end: { line: commentLine },
 						},
 					} = comment;