Skip to content

Commit 94fa461

Browse files
t-hamanot-hamano
committed
Merge branch 'trunk' into fix/fit-text-focus-loss
2 parents 05d44c7 + 6873510 commit 94fa461

530 files changed

Lines changed: 13055 additions & 2956 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.js‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,12 @@ module.exports = {
434434
{
435435
files: [ 'packages/components/src/**' ],
436436
excludedFiles: [ 'packages/components/src/**/@(test|stories)/**' ],
437-
plugins: [ 'ssr-friendly' ],
438-
extends: [ 'plugin:ssr-friendly/recommended' ],
437+
rules: {
438+
'@wordpress/no-dom-globals-in-module-scope': 'error',
439+
'@wordpress/no-dom-globals-in-constructor': 'error',
440+
'@wordpress/no-dom-globals-in-react-cc-render': 'error',
441+
'@wordpress/no-dom-globals-in-react-fc': 'error',
442+
},
439443
},
440444
{
441445
files: [ 'packages/components/src/**' ],
@@ -479,6 +483,13 @@ module.exports = {
479483
],
480484
},
481485
},
486+
{
487+
files: [ 'packages/ui/src/**' ],
488+
excludedFiles: [ '**/@(test|stories)/**' ],
489+
rules: {
490+
'@wordpress/no-unmerged-classname': 'error',
491+
},
492+
},
482493
{
483494
files: [ 'packages/ui/src/**' ],
484495
rules: {
@@ -558,8 +569,15 @@ module.exports = {
558569
{
559570
files: [ 'packages/eslint-plugin/**', 'packages/theme/**' ],
560571
rules: {
572+
'@wordpress/no-setting-ds-tokens': 'off',
561573
'@wordpress/no-unknown-ds-tokens': 'off',
562574
},
563575
},
576+
{
577+
files: [ 'storybook/stories/**' ],
578+
rules: {
579+
'@wordpress/use-recommended-components': 'off',
580+
},
581+
},
564582
],
565583
};

‎.stylelintrc.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
/** @type {import('stylelint').Config} */
22
module.exports = {
33
extends: '@wordpress/stylelint-config/scss-stylistic',
4-
plugins: [ 'stylelint-plugin-logical-css' ],
4+
plugins: [
5+
'stylelint-plugin-logical-css',
6+
'@wordpress/theme/stylelint-plugins/no-token-fallback-values',
7+
],
58
rules: {
69
'at-rule-empty-line-before': null,
710
'at-rule-no-unknown': null,
@@ -48,6 +51,7 @@ module.exports = {
4851
'scss/at-else-empty-line-before': null,
4952
'scss/at-if-closing-brace-space-after': null,
5053
'no-invalid-position-at-import-rule': null,
54+
'plugin-wpds/no-token-fallback-values': true,
5155
},
5256
overrides: [
5357
{

‎backport-changelog/7.0/11168.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11168
2+
3+
* https://github.com/WordPress/gutenberg/pull/74913

‎backport-changelog/7.0/11234.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11234
2+
3+
* https://github.com/WordPress/gutenberg/pull/76322

‎backport-changelog/7.0/11289.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11289
2+
3+
* https://github.com/WordPress/gutenberg/pull/76643

‎backport-changelog/7.0/11291.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11291
2+
3+
* https://github.com/WordPress/gutenberg/pull/76618

‎backport-changelog/7.0/11292.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11292
2+
3+
* https://github.com/WordPress/gutenberg/pull/76649

‎backport-changelog/7.1/11272.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11272
2+
3+
* https://github.com/WordPress/gutenberg/pull/76573

‎changelog.txt‎

Lines changed: 423 additions & 0 deletions
Large diffs are not rendered by default.

‎gutenberg.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
66
* Requires at least: 6.8
77
* Requires PHP: 7.4
8-
* Version: 22.7.0
8+
* Version: 22.8.0-rc.1
99
* Author: Gutenberg Team
1010
* Text Domain: gutenberg
1111
*

0 commit comments

Comments
 (0)