Skip to content

Commit

Permalink
Update to eslint 9 (#40555)
Browse files Browse the repository at this point in the history
Eslint 9 brings a new config format, which means this PR also rewrites
all the eslint configs. I took the opportunity to clean them up
(although a good bit of that wound up in earlier PRs), and added code to
fetch the textdomain from composer.json and whether the project uses
React from package.json so we don't need to have so many boilerplate
configs that just set a textdomain or enable React rules.

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12280005125

Upstream-Ref: Automattic/jetpack@9e3ae2f
  • Loading branch information
anomiex authored and matticbot committed Dec 11, 2024
1 parent a82f0da commit 5ce5d8c
Show file tree
Hide file tree
Showing 25 changed files with 240 additions and 230 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"automattic/jetpack-autoloader": "^5.0.0",
"automattic/jetpack-composer-plugin": "^4.0.0",
"automattic/jetpack-config": "^3.0.0",
"automattic/jetpack-connection": "^6.2.0",
"automattic/jetpack-connection": "^6.2.1-alpha",
"automattic/jetpack-my-jetpack": "^5.1.2-alpha",
"automattic/jetpack-search": "^0.47.4-alpha",
"automattic/jetpack-stats": "^0.14.1",
Expand Down
3 changes: 0 additions & 3 deletions jetpack_vendor/automattic/jetpack-assets/.eslintrc.cjs

This file was deleted.

5 changes: 5 additions & 0 deletions jetpack_vendor/automattic/jetpack-assets/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [4.0.2-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [4.0.1] - 2024-12-04
### Changed
- Updated package dependencies. [#40363]
Expand Down Expand Up @@ -540,6 +544,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Statically access asset tools

[4.0.2-alpha]: https://github.com/Automattic/jetpack-assets/compare/v4.0.1...v4.0.2-alpha
[4.0.1]: https://github.com/Automattic/jetpack-assets/compare/v4.0.0...v4.0.1
[4.0.0]: https://github.com/Automattic/jetpack-assets/compare/v3.0.0...v4.0.0
[3.0.0]: https://github.com/Automattic/jetpack-assets/compare/v2.3.14...v3.0.0
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-boost-core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-connection": "^6.2.0"
"automattic/jetpack-connection": "^6.2.1-alpha"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
Expand Down
3 changes: 0 additions & 3 deletions jetpack_vendor/automattic/jetpack-connection/.eslintrc.cjs

This file was deleted.

5 changes: 5 additions & 0 deletions jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [6.2.1-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [6.2.0] - 2024-12-09
### Added
- Added a mechanism to use callbacks for package options. [#40474]
Expand Down Expand Up @@ -1267,6 +1271,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Separate the connection library into its own package.

[6.2.1-alpha]: https://github.com/Automattic/jetpack-connection/compare/v6.2.0...v6.2.1-alpha
[6.2.0]: https://github.com/Automattic/jetpack-connection/compare/v6.1.1...v6.2.0
[6.1.1]: https://github.com/Automattic/jetpack-connection/compare/v6.1.0...v6.1.1
[6.1.0]: https://github.com/Automattic/jetpack-connection/compare/v6.0.1...v6.1.0
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-connection/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.2",
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
"automattic/jetpack-admin-ui": "^0.5.1",
"automattic/jetpack-assets": "^4.0.1",
"automattic/jetpack-assets": "^4.0.2-alpha",
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-roles": "^3.0.1",
"automattic/jetpack-status": "^5.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '6.2.0';
const PACKAGE_VERSION = '6.2.1-alpha';

const PACKAGE_SLUG = 'connection';

Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-explat/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-connection": "^6.2.0"
"automattic/jetpack-connection": "^6.2.1-alpha"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
Expand Down
5 changes: 5 additions & 0 deletions jetpack_vendor/automattic/jetpack-jitm/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [4.0.3-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [4.0.2] - 2024-12-04
### Changed
- Updated package dependencies. [#40363]
Expand Down Expand Up @@ -807,6 +811,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Update Jetpack to use new JITM package

[4.0.3-alpha]: https://github.com/Automattic/jetpack-jitm/compare/v4.0.2...v4.0.3-alpha
[4.0.2]: https://github.com/Automattic/jetpack-jitm/compare/v4.0.1...v4.0.2
[4.0.1]: https://github.com/Automattic/jetpack-jitm/compare/v4.0.0...v4.0.1
[4.0.0]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.29...v4.0.0
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-jitm/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"require": {
"php": ">=7.2",
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
"automattic/jetpack-assets": "^4.0.1",
"automattic/jetpack-connection": "^6.2.0",
"automattic/jetpack-assets": "^4.0.2-alpha",
"automattic/jetpack-connection": "^6.2.1-alpha",
"automattic/jetpack-device-detection": "^3.0.0",
"automattic/jetpack-logo": "^3.0.0",
"automattic/jetpack-redirect": "^3.0.1",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-jitm/src/class-jitm.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
class JITM {

const PACKAGE_VERSION = '4.0.2';
const PACKAGE_VERSION = '4.0.3-alpha';

/**
* The configuration method that is called from the jetpack-config package.
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-licensing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-connection": "^6.2.0"
"automattic/jetpack-connection": "^6.2.1-alpha"
},
"require-dev": {
"automattic/wordbless": "^0.4.2",
Expand Down
6 changes: 3 additions & 3 deletions jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"require": {
"php": ">=7.2",
"automattic/jetpack-admin-ui": "^0.5.1",
"automattic/jetpack-assets": "^4.0.1",
"automattic/jetpack-assets": "^4.0.2-alpha",
"automattic/jetpack-boost-speed-score": "^0.4.0",
"automattic/jetpack-connection": "^6.2.0",
"automattic/jetpack-connection": "^6.2.1-alpha",
"automattic/jetpack-explat": "^0.2.2",
"automattic/jetpack-jitm": "^4.0.2",
"automattic/jetpack-jitm": "^4.0.3-alpha",
"automattic/jetpack-licensing": "^3.0.2",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-redirect": "^3.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-connection": "^6.2.0",
"automattic/jetpack-connection": "^6.2.1-alpha",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-sync": "^4.1.0",
"automattic/jetpack-protect-models": "^0.4.1",
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-search/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-connection": "^6.2.0",
"automattic/jetpack-assets": "^4.0.1",
"automattic/jetpack-connection": "^6.2.1-alpha",
"automattic/jetpack-assets": "^4.0.2-alpha",
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-config": "^3.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* eslint-disable no-var */
/* global jQuery */

jQuery( document ).ready( function ( $ ) {
// Refresh our hidden field value if any checkboxes change
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-stats/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-connection": "^6.2.0",
"automattic/jetpack-connection": "^6.2.1-alpha",
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-status": "^5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-sync/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-connection": "^6.2.0",
"automattic/jetpack-connection": "^6.2.1-alpha",
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-password-checker": "^0.4.1",
"automattic/jetpack-ip": "^0.4.1",
Expand Down
10 changes: 5 additions & 5 deletions jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
),
'jetpack-assets' => array(
'path' => 'jetpack_vendor/automattic/jetpack-assets',
'ver' => '4.0.1',
'ver' => '4.0.2-alpha1733932294',
),
'jetpack-boost-core' => array(
'path' => 'jetpack_vendor/automattic/jetpack-boost-core',
Expand All @@ -26,7 +26,7 @@
),
'jetpack-connection' => array(
'path' => 'jetpack_vendor/automattic/jetpack-connection',
'ver' => '6.2.0',
'ver' => '6.2.1-alpha1733932294',
),
'jetpack-explat' => array(
'path' => 'jetpack_vendor/automattic/jetpack-explat',
Expand All @@ -38,15 +38,15 @@
),
'jetpack-jitm' => array(
'path' => 'jetpack_vendor/automattic/jetpack-jitm',
'ver' => '4.0.2',
'ver' => '4.0.3-alpha1733932294',
),
'jetpack-licensing' => array(
'path' => 'jetpack_vendor/automattic/jetpack-licensing',
'ver' => '3.0.2',
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '5.1.2-alpha1733760228',
'ver' => '5.1.2-alpha1733932294',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand All @@ -66,7 +66,7 @@
),
'jetpack-search-pkg' => array(
'path' => 'jetpack_vendor/automattic/jetpack-search',
'ver' => '0.47.4-alpha1733762305',
'ver' => '0.47.4-alpha1733932294',
),
'jetpack-stats' => array(
'path' => 'jetpack_vendor/automattic/jetpack-stats',
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-plans/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-connection": "^6.2.0"
"automattic/jetpack-connection": "^6.2.1-alpha"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
Expand Down
Loading

0 comments on commit 5ce5d8c

Please sign in to comment.