@wordpress/env 11.3.0 → 11.4.0

package/lib/config/load-config.js

@@ -61,7 +61,7 @@ module.exports = async function loadConfig(
 	if ( customConfigPath ) {
 		try {
 			await fs.stat( configFilePath );
-		} catch ( error ) {
+		} catch {
 			throw new ValidationError(
 				`Config file not found: ${ configFilePath }`
 			);

package/lib/config/parse-source-string.js

@@ -106,7 +106,7 @@ function parseSourceString( sourceString, { cacheDirectoryPath } ) {
 				basename,
 			};
 		}
-	} catch ( err ) {}
+	} catch {}
 
 	const gitHubFields = sourceString.match(
 		/^([^\/]+)\/([^#\/]+)(\/([^#]+))?(?:#(.+))?$/

package/lib/runtime/docker/docker-config.js

@@ -111,7 +111,8 @@ RUN groupadd -o -g $HOST_GID $HOST_USERNAME || true
 RUN useradd -mlo -u $HOST_UID -g $HOST_GID $HOST_USERNAME || true
 
 # Install any dependencies we need in the container.
-${ installDependencies( 'wordpress', env, config ) }`;
+${ installDependencies( 'wordpress', env, config ) }
+${ getLoopbackPortConfig( config.env[ env ].port ) }`;
 }
 
 /**
@@ -331,7 +332,39 @@ RUN echo 'spx.data_dir="/tmp/spx"' >> /usr/local/etc/php/php.ini
 RUN mkdir -p /tmp/spx && chmod 777 /tmp/spx`;
 }
 
+/**
+ * Generates Dockerfile RUN steps that make Apache also listen on the
+ * host-mapped wp-env port, so PHP loopback requests inside the container
+ * (WP-Cron, REST API loopback, Site Health) can reach WordPress at
+ * WP_HOME = http://localhost:<port>.
+ *
+ * @see https://github.com/WordPress/gutenberg/issues/20569
+ * @see https://github.com/docker-library/wordpress/issues/611#issuecomment-1378316911
+ *
+ * @param {number} port The host-side port wp-env exposes WordPress on.
+ * @return {string} The Dockerfile fragment, or '' when no change is needed.
+ */
+function getLoopbackPortConfig( port ) {
+	// Apache already listens on 80 by default and wp-env never
+	// configures SSL, so 80 and 443 are no-ops. Mirrors the same
+	// short-circuit in lib/config/add-or-replace-port.js.
+	if ( port === 80 || port === 443 ) {
+		return '';
+	}
+
+	return `
+# Make Apache listen on the wp-env-mapped port in addition to 80 so
+# PHP loopback requests (WP-Cron, REST API, Site Health) inside the
+# container reach WordPress at WP_HOME = http://localhost:${ port }.
+# See https://github.com/WordPress/gutenberg/issues/20569
+RUN echo 'Listen ${ port }' >> /etc/apache2/ports.conf
+RUN sed -i 's|<VirtualHost \\*:80>|<VirtualHost *:80 *:${ port }>|' /etc/apache2/sites-enabled/000-default.conf`;
+}
+
 module.exports = {
 	writeDockerFiles,
 	ensureDockerInitialized,
+	// Exported for testing.
+	wordpressDockerFileContents,
+	getLoopbackPortConfig,
 };

package/lib/runtime/docker/wordpress.js

@@ -64,7 +64,7 @@ async function configureWordPress( environment, config, spinner ) {
 			spinner,
 			config.debug
 		);
-	} catch ( err ) {
+	} catch {
 		// Ignore error.
 	}
 

package/lib/runtime/playground/index.js

@@ -327,7 +327,7 @@ class PlaygroundRuntime {
 			try {
 				const pidContent = await fs.readFile( pidFile, 'utf8' );
 				pid = parseInt( pidContent.trim(), 10 );
-			} catch ( error ) {
+			} catch {
 				// PID file doesn't exist or can't be read
 				spinner.text = 'Stopped WordPress Playground.';
 				return;
@@ -350,7 +350,7 @@ class PlaygroundRuntime {
 				} catch {
 					// Process group already terminated
 				}
-			} catch ( error ) {
+			} catch {
 				// Process group doesn't exist or already terminated
 			}
 

package/lib/test/build-docker-compose-config.js

@@ -3,6 +3,10 @@
  * Internal dependencies
  */
 const buildDockerComposeConfig = require( '../runtime/docker/build-docker-compose-config' );
+const {
+	wordpressDockerFileContents,
+	getLoopbackPortConfig,
+} = require( '../runtime/docker/docker-config' );
 const getHostUser = require( '../runtime/docker/get-host-user' );
 
 // The basic config keys which build docker compose config requires.
@@ -279,3 +283,45 @@ describe( 'buildDockerComposeConfig', () => {
 		} );
 	} );
 } );
+
+describe( 'getLoopbackPortConfig', () => {
+	it( 'returns Apache Listen and VirtualHost edits for a non-default port using an anchored sed pattern', () => {
+		const out = getLoopbackPortConfig( 8888 );
+		expect( out ).toContain( 'Listen 8888' );
+		expect( out ).toContain( '/etc/apache2/ports.conf' );
+		expect( out ).toContain( '<VirtualHost *:80 *:8888>' );
+		expect( out ).toContain(
+			'/etc/apache2/sites-enabled/000-default.conf'
+		);
+		// Guard against a future "simplification" to a greedy s/80/.../g
+		// that would also match e.g. unrelated "80" substrings.
+		expect( out ).not.toMatch( /s\|80\|/ );
+		expect( out ).toMatch( /s\|<VirtualHost \\\*:80>\|/ );
+	} );
+
+	it( 'returns an empty string for port 80 (Apache already listens there)', () => {
+		expect( getLoopbackPortConfig( 80 ) ).toBe( '' );
+	} );
+
+	it( 'returns an empty string for port 443 (wp-env does not configure SSL)', () => {
+		expect( getLoopbackPortConfig( 443 ) ).toBe( '' );
+	} );
+} );
+
+describe( 'wordpressDockerFileContents', () => {
+	it( 'injects the resolved per-environment port into the generated Dockerfile', () => {
+		const config = {
+			xdebug: 'off',
+			spx: 'off',
+			env: {
+				development: { port: 8888, phpVersion: null },
+				tests: { port: 8889, phpVersion: null },
+			},
+		};
+		const dockerfile = wordpressDockerFileContents( 'tests', config );
+		// Proves getLoopbackPortConfig is wired in AND that each environment
+		// uses its own port (not the development port).
+		expect( dockerfile ).toContain( 'Listen 8889' );
+		expect( dockerfile ).not.toContain( 'Listen 8888' );
+	} );
+} );

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/env",
-	"version": "11.3.0",
+	"version": "11.4.0",
 	"description": "A zero-config, self contained local WordPress environment for development and testing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -63,5 +63,5 @@
 	"scripts": {
 		"test": "echo \"Error: run tests from root\" && exit 1"
 	},
-	"gitHead": "2cea90674d11aa521ec3f71652fb3a6a4c383969"
+	"gitHead": "b862d8c84121a47bbeff882f6c87e61681ce2e0d"
 }