Proof of concept: Remove the requirement to check out the gutenberg repository and running the full build script

.env.example

@@ -8,6 +8,21 @@
 # - '{version}': any major.minor PHP version from 5.2 onwards.
 ##
 
+##
+# Local Gutenberg repository mode.
+#
+# When set to true, the build system will clone the Gutenberg git repository at
+# the commit SHA specified in package.json instead of downloading a pre-built
+# zip artifact. The repository will be built from source during `npm install`
+# and before each `grunt build`.
+#
+# This is intended for contributors who need to work across both wordpress-develop
+# and the Gutenberg repository simultaneously.
+#
+# Note: The initial build can take several minutes.
+##
+GUTENBERG_LOCAL_REPO=false
+
 # The site will be available at http://localhost:LOCAL_PORT
 LOCAL_PORT=8889
 

.github/workflows/phpunit-tests.yml

@@ -78,6 +78,7 @@ jobs:
         tests-domain: [ 'example.org' ]
         multisite: [ false, true ]
         memcached: [ false ]
+        build-from-gutenberg: [ false ]
 
         include:
           # Include jobs that test with memcached.
@@ -118,6 +119,15 @@ jobs:
             multisite: false
             memcached: false
             report: true
+          # Build directly using the Gutenberg repository.
+          - os: 'ubuntu-24.04'
+            php: '8.4'
+            db-type: 'mysql'
+            db-version: '8.4'
+            tests-domain: 'example.org'
+            multisite: false
+            memcached: false
+            build-from-gutenberg: true
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
@@ -128,6 +138,7 @@ jobs:
       phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
       tests-domain: ${{ matrix.tests-domain }}
       report: ${{ matrix.report || false }}
+      build-from-gutenberg-repo: ${{ matrix.build-from-gutenberg || false }}
 
   #
   # Creates a PHPUnit test job for each PHP/MariaDB combination.

.github/workflows/reusable-phpunit-tests-v3.yml

@@ -72,6 +72,12 @@ on:
         required: false
         type: boolean
         default: false
+      build-from-gutenberg-repo:
+        description: 'Whether to build directly from the Gutenberg repository.'
+        required: false
+        type: 'boolean'
+        default: false
+
     secrets:
       CODECOV_TOKEN:
         description: 'The Codecov token required for uploading reports.'
@@ -118,11 +124,13 @@ jobs:
   # - Checks out the WordPress Test reporter repository.
   # - Submit the test results to the WordPress.org host test results.
   phpunit-tests:
-    name: ${{ ( inputs.phpunit-test-groups || inputs.coverage-report ) && format( 'PHP {0} with ', inputs.php ) || '' }} ${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.db-innovation && ' (innovation release)' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }}
+    name: ${{ ( inputs.phpunit-test-groups || inputs.coverage-report ) && format( 'PHP {0} with ', inputs.php ) || '' }} ${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.db-innovation && ' (innovation release)' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }}${{ inputs.build-from-gutenberg-repo && ' built from Gutenberg repo' || '' }}
     runs-on: ${{ inputs.os }}
     timeout-minutes: ${{ inputs.coverage-report && 120 || inputs.php == '8.4' && 30 || 20 }}
     permissions:
       contents: read
+    env:
+      GUTENBERG_LOCAL_REPO: ${{ inputs.build-from-gutenberg-repo }}
 
     steps:
       - name: Configure environment variables

.github/workflows/reusable-test-core-build-process.yml

@@ -36,6 +36,11 @@ on:
         required: false
         type: 'boolean'
         default: false
+      build-from-gutenberg-repo:
+        description: 'Whether to build directly from the Gutenberg repository.'
+        required: false
+        type: 'boolean'
+        default: false
 
 env:
   PUPPETEER_SKIP_DOWNLOAD: ${{ true }}
@@ -62,11 +67,13 @@ jobs:
   # - Saves the pull request number to a text file.
   # - Uploads the pull request number as an artifact.
   build-process-tests:
-    name: ${{ contains( inputs.os, 'macos-' ) && 'MacOS' || contains( inputs.os, 'windows-' ) && 'Windows' || 'Linux' }}
+    name: ${{ contains( inputs.os, 'macos-' ) && 'MacOS' || contains( inputs.os, 'windows-' ) && 'Windows' || 'Linux' }}${{ inputs.build-from-gutenberg-repo && ' built from Gutenberg repo' || '' }}
     permissions:
       contents: read
     runs-on: ${{ inputs.os }}
     timeout-minutes: 20
+    env:
+      GUTENBERG_LOCAL_REPO: ${{ inputs.build-from-gutenberg-repo }}
 
     steps:
       - name: Checkout repository

.github/workflows/test-build-processes.yml

@@ -59,18 +59,23 @@ jobs:
         os: [ 'ubuntu-24.04' ]
         directory: [ 'src', 'build' ]
         test-certificates: [ true ]
+        build-from-gutenberg: [ true, false ]
+
         include:
           # Only prepare artifacts for Playground once.
           - os: 'ubuntu-24.04'
             directory: 'build'
             save-build: true
             prepare-playground: ${{ github.event_name == 'pull_request' && true || '' }}
+            build-from-gutenberg: false
+
     with:
       os: ${{ matrix.os }}
       directory: ${{ matrix.directory }}
       test-certificates: ${{ matrix.test-certificates && true || false }}
       save-build: ${{ matrix.save-build && matrix.save-build || false }}
       prepare-playground: ${{ matrix.prepare-playground && matrix.prepare-playground || false }}
+      build-from-gutenberg-repo: ${{ matrix.build-from-gutenberg && matrix.build-from-gutenberg || false }}
 
   # Tests the WordPress Core build process on additional operating systems.
   #

.gitignore

@@ -42,7 +42,8 @@ wp-tests-config.php
 /src/wp-includes/build
 /src/wp-includes/theme.json
 /packagehash.txt
-/.gutenberg-hash
+/.gutenberg-dir-hash
+/.gutenberg-repo-hash
 /artifacts
 /setup.log
 /coverage

Gruntfile.js

@@ -53,7 +53,6 @@ module.exports = function(grunt) {
 		webpackFiles = [
 			'wp-includes/assets/*',
 			'wp-includes/css/dist',
-			'wp-includes/blocks/**/*.css',
 			'!wp-includes/assets/script-loader-packages.min.php',
 			'!wp-includes/assets/script-modules-packages.min.php',
 		],
@@ -1468,45 +1467,81 @@ module.exports = function(grunt) {
 	} );
 
 	// Gutenberg integration tasks.
-	grunt.registerTask( 'gutenberg-checkout', 'Checks out the Gutenberg repository.', function() {
+	grunt.registerTask( 'gutenberg:verify', 'Verifies the installed Gutenberg version matches the expected SHA.', function() {
 		const done = this.async();
 		grunt.util.spawn( {
 			cmd: 'node',
-			args: [ 'tools/gutenberg/checkout-gutenberg.js' ],
+			args: [ 'tools/gutenberg/utils.js' ],
 			opts: { stdio: 'inherit' }
 		}, function( error ) {
 			done( ! error );
 		} );
 	} );
 
-	grunt.registerTask( 'gutenberg-build', 'Builds the Gutenberg repository.', function() {
+	grunt.registerTask( 'gutenberg:download', 'Downloads the built Gutenberg artifact.', function() {
 		const done = this.async();
+		const args = [ 'tools/gutenberg/download.js' ];
+		if ( grunt.option( 'force' ) ) {
+			args.push( '--force' );
+		}
 		grunt.util.spawn( {
 			cmd: 'node',
-			args: [ 'tools/gutenberg/build-gutenberg.js' ],
+			args,
 			opts: { stdio: 'inherit' }
 		}, function( error ) {
 			done( ! error );
 		} );
 	} );
 
-	grunt.registerTask( 'gutenberg-copy', 'Copies Gutenberg build output to WordPress Core.', function() {
+	grunt.registerTask( 'gutenberg:checkout', 'Clones the Gutenberg git repository at the SHA specified in package.json (local repository mode only).', function() {
+		const done = this.async();
+		const args = [ 'tools/gutenberg/checkout.js' ];
+		if ( grunt.option( 'force' ) ) {
+			args.push( '--force' );
+		}
+		grunt.util.spawn( {
+			cmd: 'node',
+			args,
+			opts: { stdio: 'inherit' }
+		}, function( error ) {
+			done( ! error );
+		} );
+	} );
+
+	grunt.registerTask( 'gutenberg:build:run', 'Builds Gutenberg from source for WordPress Core (local repository mode only).', function() {
+		const done = this.async();
+		const args = [ 'tools/gutenberg/build.js' ];
+		if ( grunt.option( 'force' ) ) {
+			args.push( '--force' );
+		}
+		grunt.util.spawn( {
+			cmd: 'node',
+			args,
+			opts: { stdio: 'inherit' }
+		}, function( error ) {
+			done( ! error );
+		} );
+	} );
+
+	grunt.registerTask( 'gutenberg:build', 'Builds Gutenberg from source and copies the result to WordPress Core.', [ 'gutenberg:build:run', 'gutenberg:copy' ] );
+
+	grunt.registerTask( 'gutenberg:sync', 'Downloads or checks out Gutenberg at the expected SHA, builds if needed, and copies to WordPress Core.', function() {
 		const done = this.async();
-		const buildDir = grunt.option( 'dev' ) ? 'src' : 'build';
 		grunt.util.spawn( {
 			cmd: 'node',
-			args: [ 'tools/gutenberg/copy-gutenberg-build.js', `--build-dir=${ buildDir }` ],
+			args: [ 'tools/gutenberg/sync.js' ],
 			opts: { stdio: 'inherit' }
 		}, function( error ) {
 			done( ! error );
 		} );
 	} );
 
-	grunt.registerTask( 'gutenberg-sync', 'Syncs Gutenberg checkout and build if ref has changed.', function() {
+	grunt.registerTask( 'gutenberg:copy', 'Copies Gutenberg build output to WordPress Core.', function() {
 		const done = this.async();
+		const buildDir = grunt.option( 'dev' ) ? 'src' : 'build';
 		grunt.util.spawn( {
 			cmd: 'node',
-			args: [ 'tools/gutenberg/sync-gutenberg.js' ],
+			args: [ 'tools/gutenberg/copy.js', `--build-dir=${ buildDir }` ],
 			opts: { stdio: 'inherit' }
 		}, function( error ) {
 			done( ! error );
@@ -1951,23 +1986,23 @@ module.exports = function(grunt) {
 	grunt.registerTask( 'build', function() {
 		if ( grunt.option( 'dev' ) ) {
 			grunt.task.run( [
+				'gutenberg:verify',
 				'build:js',
 				'build:css',
 				'build:codemirror',
-				'gutenberg-sync',
-				'gutenberg-copy',
+				'gutenberg:build',
 				'copy-vendor-scripts',
 				'build:certificates'
 			] );
 		} else {
 			grunt.task.run( [
+				'gutenberg:verify',
 				'build:certificates',
 				'build:files',
 				'build:js',
 				'build:css',
 				'build:codemirror',
-				'gutenberg-sync',
-				'gutenberg-copy',
+				'gutenberg:build',
 				'copy-vendor-scripts',
 				'replace:source-maps',
 				'verify:build'

package.json

@@ -7,7 +7,8 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"gutenberg": {
-		"ref": "022d8dd3d461f91b15c1f0410649d3ebb027207f"
+		"sha": "1ed7da329cc9ffb27cbe5d373ea15db309a135b7",
+		"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
 	},
 	"engines": {
 		"node": ">=20.10.0",
@@ -106,7 +107,7 @@
 		"wicg-inert": "3.1.3"
 	},
 	"scripts": {
-		"postinstall": "npm run gutenberg:sync && npm run gutenberg:copy -- --dev",
+		"postinstall": "npm run gutenberg:sync",
 		"build": "grunt build",
 		"build:dev": "grunt build --dev",
 		"dev": "grunt watch --dev",
@@ -131,12 +132,13 @@
 		"test:e2e": "wp-scripts test-playwright --config tests/e2e/playwright.config.js",
 		"test:visual": "wp-scripts test-playwright --config tests/visual-regression/playwright.config.js",
 		"typecheck:php": "node ./tools/local-env/scripts/docker.js run --rm php composer phpstan",
-		"gutenberg:checkout": "node tools/gutenberg/checkout-gutenberg.js",
-		"gutenberg:build": "node tools/gutenberg/build-gutenberg.js",
-		"gutenberg:copy": "node tools/gutenberg/copy-gutenberg-build.js",
-		"gutenberg:sync": "node tools/gutenberg/sync-gutenberg.js",
+		"gutenberg:build": "node tools/gutenberg/build.js",
+		"gutenberg:checkout": "node tools/gutenberg/checkout.js",
+		"gutenberg:copy": "node tools/gutenberg/copy.js",
+		"gutenberg:download": "node tools/gutenberg/download.js",
+		"gutenberg:sync": "node tools/gutenberg/sync.js",
 		"vendor:copy": "node tools/vendors/copy-vendors.js",
 		"sync-gutenberg-packages": "grunt sync-gutenberg-packages",
 		"postsync-gutenberg-packages": "grunt wp-packages:sync-stable-blocks && grunt build --dev && grunt build"
 	}
-}
+}

tests/phpstan/base.neon

@@ -105,7 +105,7 @@ parameters:
 			- ../../src/wp-includes/deprecated.php
 			- ../../src/wp-includes/ms-deprecated.php
 			- ../../src/wp-includes/pluggable-deprecated.php
-			# These files are sourced by wordpress/gutenberg in `tools/release/sync-stable-blocks.js`.
+			# These files are autogenerated by tools/gutenberg/copy.js.
 			- ../../src/wp-includes/blocks
 			# Third-party libraries.
 			- ../../src/wp-admin/includes/class-ftp-pure.php