Sync with trunk (#31427)

.github/CODEOWNERS

@@ -15,7 +15,12 @@
 /packages/block-library/src/gallery             @mkevins
 /packages/block-library/src/social-links        @mkaz
 /packages/block-library/src/social-link         @mkaz
-/packages/block-library/src/image               @ajlende
+
+# Duotone
+/lib/block-supports/duotone.php                       @ajlende
+/packages/block-editor/src/components/duotone-control @ajlende
+/packages/block-editor/src/hooks/duotone.js           @ajlende
+/packages/components/src/duotone-picker               @ajlende
 
 # Editor
 /packages/annotations                           @atimmer

.github/workflows/end2end-test.yml

@@ -5,6 +5,7 @@ on:
     push:
         branches:
             - trunk
+            - 'release/**'
             - 'wp/**'
 
 jobs:

.github/workflows/static-checks.yml

@@ -5,6 +5,7 @@ on:
     push:
         branches:
             - trunk
+            - 'release/**'
             - 'wp/**'
 
 jobs:
@@ -42,9 +43,6 @@ jobs:
             - name: Lint JavaScript and Styles
               run: npm run lint
 
-            - name: Lint ES5 built files (IE11)
-              run: npx eslint --parser-options=ecmaVersion:5 --no-eslintrc --no-ignore ./build/**/*.js
-
             - name: Type checking
               run: npm run build:package-types
 

.github/workflows/storybook-pages.yml

@@ -39,3 +39,4 @@ jobs:
               with:
                   github_token: ${{ secrets.GITHUB_TOKEN }}
                   publish_dir: ./storybook/build
+                  force_orphan: true

.github/workflows/unit-test.yml

@@ -7,6 +7,7 @@ on:
     push:
         branches:
             - trunk
+            - 'release/**'
             - 'wp/**'
 
 jobs:

.prettierignore

@@ -0,0 +1,8 @@
+.cache
+build
+build-module
+build-types
+packages/block-serialization-spec-parser/parser.js
+packages/e2e-tests/plugins
+packages/react-native-editor/bundle
+vendor

bin/packages/build.js

@@ -114,6 +114,18 @@ function createStyleEntryTransform() {
 			const entries = await glob(
 				path.resolve( PACKAGES_DIR, packageName, 'src/*.scss' )
 			);
+
+			// Account for the specific case where block styles in
+			// block-library package also need rebuilding.
+			if (
+				packageName === 'block-library' &&
+				[ 'style.scss', 'editor.scss' ].includes(
+					path.basename( file )
+				)
+			) {
+				entries.push( file );
+			}
+
 			entries.forEach( ( entry ) => this.push( entry ) );
 
 			// Find other stylesheets that need to be rebuilt because

bin/packages/watch.js

@@ -31,6 +31,20 @@ function exists( filename ) {
 	return false;
 }
 
+/**
+ * Is the path name a directory?
+ *
+ * @param {string} pathname
+ *
+ * @return {boolean} True if the given path is a directory.
+ */
+function isDirectory( pathname ) {
+	try {
+		return fs.statSync( pathname ).isDirectory();
+	} catch ( e ) {}
+	return false;
+}
+
 /**
  * Determine if a file is source code.
  *
@@ -43,12 +57,16 @@ function exists( filename ) {
  * @return {boolean} True if the file a source file.
  */
 function isSourceFile( filename ) {
+	// Only run this regex on the relative path, otherwise we might run
+	// into some false positives when eg. the project directory contains `src`
+	const relativePath = path.relative( process.cwd(), filename );
+
 	return (
-		/\/src\/.+\.(js|json|scss)$/.test( filename ) &&
+		/\/src\/.+\.(js|json|scss)$/.test( relativePath ) &&
 		! [
 			/\/(benchmark|__mocks__|__tests__|test|storybook|stories)\/.+/,
 			/.\.(spec|test)\.js$/,
-		].some( ( regex ) => regex.test( filename ) )
+		].some( ( regex ) => regex.test( relativePath ) )
 	);
 }
 
@@ -77,6 +95,13 @@ function isModulePackage( filename ) {
  * @return {boolean | symbol} True if the file should be watched.
  */
 function isWatchableFile( filename, skip ) {
+	// Recursive file watching is not available on a Linux-based OS. If this is the case,
+	// the watcher library falls back to watching changes in the subdirectories
+	// and passes the directories to this filter callback instead.
+	if ( isDirectory( filename ) ) {
+		return true;
+	}
+
 	return isSourceFile( filename ) && isModulePackage( filename )
 		? true
 		: skip;
@@ -147,6 +172,12 @@ watch(
 	PACKAGES_DIR,
 	{ recursive: true, delay: 500, filter: isWatchableFile },
 	( event, filename ) => {
+		// Double check whether we're dealing with a file that needs watching, to accomodate for
+		// the inability to watch recursively on linux-based operating systems.
+		if ( ! isSourceFile( filename ) || ! isModulePackage( filename ) ) {
+			return;
+		}
+
 		switch ( event ) {
 			case 'update':
 				updateBuildFile( event, filename );

bin/plugin/commands/common.js

@@ -116,6 +116,7 @@ function calculateVersionBumpFromChangelog(
 		if (
 			lineNormalized.startsWith( '### deprecation' ) ||
 			lineNormalized.startsWith( '### enhancement' ) ||
+			lineNormalized.startsWith( '### new api' ) ||
 			lineNormalized.startsWith( '### new feature' )
 		) {
 			versionBump = 'minor';