Skip to content

Commit

Permalink
Resolves #37695 - Use clsx instead of classnames (#37708)
Browse files Browse the repository at this point in the history
* Add rule to disallow `classnames`

* Initial pass

* `classnames/dedupe` → `@wordpress/token-list`

* Add changelog

* Use valid changelog types

* Remove file from eslint exclusions

* Change post-rebase use of classnames

* More changelog format compliance fixes

* Bump versions

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

Upstream-Ref: Automattic/jetpack@40a8492
  • Loading branch information
tbradsha authored and matticbot committed Jun 10, 2024
1 parent 7cf3c8a commit ab5ad69
Show file tree
Hide file tree
Showing 26 changed files with 194 additions and 215 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"automattic/jetpack-composer-plugin": "^2.0.2",
"automattic/jetpack-config": "^2.0.3",
"automattic/jetpack-connection": "^2.10.0",
"automattic/jetpack-my-jetpack": "^4.24.4",
"automattic/jetpack-my-jetpack": "^4.24.5-alpha",
"automattic/jetpack-search": "^0.44.9-alpha",
"automattic/jetpack-stats": "^0.13.0-alpha",
"automattic/jetpack-status": "^3.3.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('react', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '0f55b9c7c2a4905dd789');
<?php return array('dependencies' => array('react', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '9ecc7f55d47c4ea37ec8');

Large diffs are not rendered by default.

This file was deleted.

8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ 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.24.5-alpha] - unreleased

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

### Changed
- Change codebase to use clsx instead of classnames.

## [4.24.4] - 2024-06-10
### Added
- Add mechanism to track previously working plugins [#37537]
Expand Down Expand Up @@ -1503,6 +1510,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Created package

[4.24.5-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.24.4...4.24.5-alpha
[4.24.4]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.24.3...4.24.4
[4.24.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.24.2...4.24.3
[4.24.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.24.1...4.24.2
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '7fd10fc0c13accdd0f47');
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '4443e3857f2017fbb7b4');
62 changes: 31 additions & 31 deletions jetpack_vendor/automattic/jetpack-my-jetpack/build/index.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
* @see https://github.com/kvz/phpjs/blob/ffe1356af23a6f2512c84c954dd4e828e92579fa/functions/strings/number_format.js
*/

/*!
Copyright (c) 2018 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/

/**
* @license React
* react-jsx-runtime.production.min.js
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Initializer {
*
* @var string
*/
const PACKAGE_VERSION = '4.24.4';
const PACKAGE_VERSION = '4.24.5-alpha';

/**
* HTML container ID for the IDC screen on My Jetpack page.
Expand Down
1 change: 1 addition & 0 deletions jetpack_vendor/automattic/jetpack-search/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
This is an alpha version! The changes listed here are not final.

### Changed
- Change codebase to use clsx instead of classnames.
- Updated package dependencies.

## [0.44.8] - 2024-05-27
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-block-editor', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport'), 'version' => 'aa4d34cf56fa4874f32d');
<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-block-editor', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport'), 'version' => 'a09772be0883d20b415b');

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
/*!
Copyright (c) 2018 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/

/**
* @license React
* react-jsx-runtime.production.min.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('react', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '200d9630130d83268ca8');
<?php return array('dependencies' => array('react', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'b6ad79ba84534bec8b16');

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
* @see https://github.com/kvz/phpjs/blob/ffe1356af23a6f2512c84c954dd4e828e92579fa/functions/strings/number_format.js
*/

/*!
Copyright (c) 2018 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/

/**
* @license React
* react-jsx-runtime.production.min.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('wp-i18n', 'wp-jp-i18n-loader', 'wp-polyfill', 'wp-url'), 'version' => '60d249dfbd8418cf84bc');
<?php return array('dependencies' => array('wp-i18n', 'wp-jp-i18n-loader', 'wp-polyfill', 'wp-url'), 'version' => '9a20d8fb43f7892a3715');

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
/*!
Copyright (c) 2018 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/

/** @license React v16.13.1
* react-is.production.min.js
*
Expand Down

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

2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-search/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"automattic/jetpack-constants": "^2.0.3",
"automattic/jetpack-status": "^3.3.0",
"automattic/jetpack-config": "^2.0.3",
"automattic/jetpack-my-jetpack": "^4.24.4",
"automattic/jetpack-my-jetpack": "^4.24.5-alpha",
"automattic/jetpack-sync": "^3.1.0"
},
"require-dev": {
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '4.24.4',
'ver' => '4.24.5-alpha1718035585',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand All @@ -54,7 +54,7 @@
),
'jetpack-search-pkg' => array(
'path' => 'jetpack_vendor/automattic/jetpack-search',
'ver' => '0.44.9-alpha1717519483',
'ver' => '0.44.9-alpha1718035585',
),
'jetpack-stats' => array(
'path' => 'jetpack_vendor/automattic/jetpack-stats',
Expand Down
Loading

0 comments on commit ab5ad69

Please sign in to comment.