Merge changes published in the Gutenberg plugin "release/22.6" branch

Author: gutenbergplugin

.eslintignore

@@ -7,5 +7,6 @@ node_modules
 packages/block-serialization-spec-parser/parser.js
 packages/icons/src/library/*.tsx
 packages/react-native-editor/bundle
+packages/vips/src/worker-code.ts
 vendor
 !.*.js

.eslintrc.js

@@ -65,6 +65,11 @@ const restrictedImports = [
 		message:
 			"Please use `clsx` instead. It's a lighter and faster drop-in replacement for `classnames`.",
 	},
+	{
+		name: '@base-ui/react',
+		message:
+			'Avoid using Base UI directly. Consider a new `@wordpress/ui` component instead.',
+	},
 ];
 
 const restrictedSyntax = [
@@ -445,13 +450,12 @@ module.exports = {
 			},
 		},
 		{
-			files: [ 'packages/components/src/**', 'packages/ui/src/**' ],
+			files: [ 'packages/components/src/**' ],
 			rules: {
 				'no-restricted-imports': [
 					'error',
-					// The `ariakit` and `framer-motion` APIs are meant to be consumed via
-					// the `@wordpress/components` and @wordpress/ui` packages, hence why
-					// importing those imports should be allowed only in those packages.
+					// The following dependencies are meant to be consumed directly in the
+					// @wordpress/components package, hence why their imports are allowed.
 					{
 						paths: restrictedImports.filter(
 							( { name } ) =>
@@ -464,6 +468,22 @@ module.exports = {
 				],
 			},
 		},
+		{
+			files: [ 'packages/ui/src/**' ],
+			rules: {
+				'no-restricted-imports': [
+					'error',
+					// The following dependencies are meant to be consumed directly in the
+					// @wordpress/ui package, hence why their imports are allowed.
+					{
+						paths: restrictedImports.filter(
+							( { name } ) =>
+								! [ '@base-ui/react' ].includes( name )
+						),
+					},
+				],
+			},
+		},
 		{
 			files: [ 'packages/block-editor/**' ],
 			rules: {

.github/CODEOWNERS

@@ -18,10 +18,10 @@
 /packages/block-library/src/table-of-contents   @ZebulanStanphill
 
 # Duotone
-/lib/block-supports/duotone.php
-/packages/block-editor/src/components/duotone-control
-/packages/block-editor/src/hooks/duotone.js
-/packages/components/src/duotone-picker
+/lib/block-supports/duotone.php									@sgomes
+/packages/block-editor/src/components/duotone-control	@sgomes
+/packages/block-editor/src/hooks/duotone.js			@sgomes
+/packages/components/src/duotone-picker					@sgomes
 
 # Editor
 /packages/annotations                           @atimmer

.github/workflows/check-backport-changelog.yml

@@ -9,6 +9,7 @@ on:
             - 'lib/**'
             - '!lib/load.php'
             - '!lib/experiments-page.php'
+            - '!lib/theme.json'
             - '!lib/experimental/**'
             - 'phpunit/**'
             - '!phpunit/experimental/**'
@@ -18,6 +19,7 @@ on:
             - '!packages/block-serialization-default-parser/**'
             - '!packages/widgets/**'
             - '!packages/e2e-tests/**'
+            - '!packages/icons/src/manifest.php'
 
 # Disable permissions for all available scopes by default.
 # Any needed permissions should be configured at the job level.

.github/workflows/end2end-test.yml

@@ -50,7 +50,7 @@ jobs:
 
             - name: Install WordPress and start the server
               run: |
-                  npm run wp-env start
+                  npm run wp-env-test start
 
             - name: Run the tests
               env:

.github/workflows/unit-test.yml

@@ -261,20 +261,20 @@ jobs:
                   locale -a
 
             - name: Start Docker environment
-              run: npm run wp-env start
+              run: npm run wp-env-test start
 
             - name: Log running Docker containers
               run: docker ps -a
 
             - name: Docker container debug information
               run: |
-                  npm run wp-env run tests-mysql mysql -- --version
-                  npm run wp-env run tests-wordpress php -- --version
-                  npm run wp-env run tests-wordpress php -m
-                  npm run wp-env run tests-wordpress php -i
-                  npm run wp-env run tests-wordpress /var/www/html/wp-content/plugins/gutenberg/vendor/bin/phpunit -- --version
-                  npm run wp-env run tests-wordpress locale -a
-                  npm run wp-env run tests-cli wp core version
+                  npm run wp-env-test -- run mysql mariadb -- --version
+                  npm run wp-env-test -- run wordpress php -- --version
+                  npm run wp-env-test -- run wordpress php -m
+                  npm run wp-env-test -- run wordpress php -i
+                  npm run wp-env-test -- run wordpress /var/www/html/wp-content/plugins/gutenberg/vendor/bin/phpunit -- --version
+                  npm run wp-env-test -- run wordpress locale -a
+                  npm run wp-env-test -- run cli wp core version
 
             - name: Running single site unit tests
               if: ${{ ! matrix.multisite }}

.gitignore

@@ -5,6 +5,7 @@ build-style
 build-types
 build-wp
 node_modules
+.wasm-vips-build
 gutenberg.zip
 .content-entry.js
 coverage
@@ -43,6 +44,7 @@ junit.xml
 
 # Local overrides
 .wp-env.override.json
+.wp-env.test.override.json
 playwright.config.override.ts
 phpcs.xml
 phpunit.xml

.stylelintrc.js

@@ -53,6 +53,19 @@ module.exports = {
 		{
 			files: [ '**/*.module.css' ],
 			rules: {
+				'function-no-unknown': [
+					true,
+					{
+						ignoreFunctions: [
+							// CSS stepped value math functions in Baseline 2024.
+							// This rule exception can likely be removed when
+							// updating to a more recent version of Stylelint.
+							'round',
+							'rem',
+							'mod',
+						],
+					},
+				],
 				'declaration-property-max-values': {
 					// Prevents left/right values with shorthand property names (unclear for RTL)
 					margin: 3,

.wp-env.json

@@ -1,22 +1,8 @@
 {
 	"$schema": "./schemas/json/wp-env.json",
+	"testsEnvironment": false,
 	"core": "WordPress/WordPress",
 	"plugins": [ "." ],
 	"themes": [ "./test/emptytheme" ],
-	"env": {
-		"development": {
-			"phpmyadminPort": 9000
-		},
-		"tests": {
-			"mappings": {
-				"wp-content/plugins/gutenberg": ".",
-				"wp-content/mu-plugins": "./packages/e2e-tests/mu-plugins",
-				"wp-content/plugins/gutenberg-test-plugins": "./packages/e2e-tests/plugins",
-				"wp-content/themes/gutenberg-test-themes": "./test/gutenberg-test-themes",
-				"wp-content/themes/gutenberg-test-themes/twentytwentyone": "https://downloads.wordpress.org/theme/twentytwentyone.2.1.zip",
-				"wp-content/themes/gutenberg-test-themes/twentytwentythree": "https://downloads.wordpress.org/theme/twentytwentythree.1.3.zip",
-				"wp-content/themes/gutenberg-test-themes/twentytwentyfour": "https://downloads.wordpress.org/theme/twentytwentyfour.1.0.zip"
-			}
-		}
-	}
+	"phpmyadminPort": 9000
 }

.wp-env.test.json

@@ -0,0 +1,21 @@
+{
+	"$schema": "./schemas/json/wp-env.json",
+	"testsEnvironment": false,
+	"port": 8889,
+	"core": "WordPress/WordPress",
+	"plugins": [ "." ],
+	"themes": [ "./test/emptytheme" ],
+	"config": {
+		"WP_DEBUG": false,
+		"SCRIPT_DEBUG": false
+	},
+	"mappings": {
+		"wp-content/plugins/gutenberg": ".",
+		"wp-content/mu-plugins": "./packages/e2e-tests/mu-plugins",
+		"wp-content/plugins/gutenberg-test-plugins": "./packages/e2e-tests/plugins",
+		"wp-content/themes/gutenberg-test-themes": "./test/gutenberg-test-themes",
+		"wp-content/themes/gutenberg-test-themes/twentytwentyone": "https://downloads.wordpress.org/theme/twentytwentyone.2.1.zip",
+		"wp-content/themes/gutenberg-test-themes/twentytwentythree": "https://downloads.wordpress.org/theme/twentytwentythree.1.3.zip",
+		"wp-content/themes/gutenberg-test-themes/twentytwentyfour": "https://downloads.wordpress.org/theme/twentytwentyfour.1.0.zip"
+	}
+}