Merge branch 'trunk' into set-sapi-name

adamziel · web-flow · commit 8945c7e5743c · 2025-07-25T20:23:01.000+02:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,6 +3,7 @@
 	"eslint.validate": [
 		"json"
 	],
+	"eslint.useFlatConfig": false,
 	"files.associations": {
 		"*.embeddedhtml": "html",
 		"api-extractor-base.json": "jsonc",
diff --git a/packages/docs/site/project.json b/packages/docs/site/project.json
@@ -83,6 +83,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/docs/site/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/docs/site/sidebars.js b/packages/docs/site/sidebars.js
@@ -110,7 +110,7 @@ const sidebars = {
 						'blueprints/json-api-and-function-api',
 					],
 				},
-
+				'blueprints/bundles',
 				'blueprints/examples',
 				'blueprints/troubleshoot-and-debug-blueprints',
 			],
diff --git a/packages/nx-extensions/project.json b/packages/nx-extensions/project.json
@@ -41,6 +41,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": [
 					"packages/nx-extensions/**/*.ts",
 					"packages/nx-extensions/generators.json",
diff --git a/packages/nx-extensions/src/executors/package-json/executor.ts b/packages/nx-extensions/src/executors/package-json/executor.ts
@@ -156,6 +156,15 @@ async function buildPackageJson(
 	}
 	packageJson.main = main;
 
+	// Playground-client is a dependency-less package. Let's make sure it can be installed
+	// without bringing in any other packages.
+	if ('playground-client' === context.projectName) {
+		delete packageJson.overrides;
+		delete packageJson.dependencies;
+		delete packageJson.devDependencies;
+		delete packageJson.optionalDependencies;
+	}
+
 	fs.writeFileSync(
 		options.outputPath + '/package.json',
 		serializeJson(packageJson)
diff --git a/packages/php-wasm/cli/project.json b/packages/php-wasm/cli/project.json
@@ -99,6 +99,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/php-wasm/cli/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/php-wasm/fs-journal/project.json b/packages/php-wasm/fs-journal/project.json
@@ -62,6 +62,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/php-wasm/fs-journal/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/php-wasm/logger/project.json b/packages/php-wasm/logger/project.json
@@ -60,6 +60,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/php-wasm/logger/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/php-wasm/node-polyfills/project.json b/packages/php-wasm/node-polyfills/project.json
@@ -66,6 +66,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": [
 					"packages/php-wasm/node-polyfills/**/*.ts",
 					"packages/php-wasm/node-polyfills/package.json"
diff --git a/packages/php-wasm/node/project.json b/packages/php-wasm/node/project.json
@@ -314,6 +314,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/php-wasm/node/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/php-wasm/progress/project.json b/packages/php-wasm/progress/project.json
@@ -56,6 +56,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/php-wasm/progress/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/php-wasm/scopes/project.json b/packages/php-wasm/scopes/project.json
@@ -40,6 +40,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/php-wasm/scopes/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/php-wasm/stream-compression/project.json b/packages/php-wasm/stream-compression/project.json
@@ -49,6 +49,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": [
 					"packages/php-wasm/stream-compression/**/*.ts",
 					"packages/php-wasm/stream-compression/package.json"
diff --git a/packages/php-wasm/universal/project.json b/packages/php-wasm/universal/project.json
@@ -60,6 +60,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/php-wasm/universal/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/php-wasm/util/project.json b/packages/php-wasm/util/project.json
@@ -48,6 +48,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/php-wasm/util/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/php-wasm/web-service-worker/project.json b/packages/php-wasm/web-service-worker/project.json
@@ -41,6 +41,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": [
 					"packages/php-wasm/web-service-worker/**/*.ts"
 				],
diff --git a/packages/php-wasm/web/project.json b/packages/php-wasm/web/project.json
@@ -110,6 +110,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/php-wasm/web/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/php-wasm/xdebug-bridge/project.json b/packages/php-wasm/xdebug-bridge/project.json
@@ -53,6 +53,7 @@
 			"executor": "@nx/eslint:lint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/php-wasm/xdebug-bridge/**/*.ts"]
 			}
 		},
diff --git a/packages/php-wasm/xdebug-bridge/src/lib/start-bridge.ts b/packages/php-wasm/xdebug-bridge/src/lib/start-bridge.ts
@@ -14,7 +14,7 @@ export type StartBridgeConfig = {
 	localRoot?: string;
 
 	phpInstance?: PHP;
-	getPHPFile?: (path: string) => Promise<string>;
+	getPHPFile?: (path: string) => string | Promise<string>;
 };
 
 export async function startBridge(config: StartBridgeConfig) {
@@ -58,21 +58,17 @@ export async function startBridge(config: StartBridgeConfig) {
 	}
 
 	const getPHPFile = config.phpInstance
-		? (path: string) =>
-				new Promise<string>(() =>
-					config.phpInstance!.readFileAsText(path)
-				)
+		? (path: string) => config.phpInstance!.readFileAsText(path)
 		: config.getPHPFile
 		? config.getPHPFile
-		: (path: string) =>
-				new Promise<string>(() => {
-					// Default implementation: read from filesystem
-					// Convert file:/// URLs to local paths
-					const localPath = path.startsWith('file://')
-						? path.replace('file://', '')
-						: path;
-					return readFileSync(localPath, 'utf-8');
-				});
+		: (path: string) => {
+				// Default implementation: read from filesystem
+				// Convert file:/// URLs to local paths
+				const localPath = path.startsWith('file://')
+					? path.replace('file://', '')
+					: path;
+				return readFileSync(localPath, 'utf-8');
+		  };
 
 	const phpFiles = getPhpFiles(phpRoot);
 	return new XdebugCDPBridge(dbgpSession, cdpServer, {
diff --git a/packages/php-wasm/xdebug-bridge/src/lib/xdebug-cdp-bridge.ts b/packages/php-wasm/xdebug-bridge/src/lib/xdebug-cdp-bridge.ts
@@ -28,7 +28,7 @@ export interface XdebugCDPBridgeConfig {
 	knownScriptUrls: string[];
 	remoteRoot?: string;
 	localRoot?: string;
-	getPHPFile(path: string): Promise<string>;
+	getPHPFile(path: string): string | Promise<string>;
 }
 
 export class XdebugCDPBridge {
@@ -45,7 +45,7 @@ export class XdebugCDPBridge {
 	private xdebugConnected = false;
 	private xdebugStatus = 'starting';
 	private initFileUri: string | null = null;
-	private readPHPFile: (path: string) => Promise<string>;
+	private readPHPFile: (path: string) => string | Promise<string>;
 	private remoteRoot: string;
 	private localRoot: string;
 
diff --git a/packages/playground/blueprints/project.json b/packages/playground/blueprints/project.json
@@ -93,6 +93,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/playground/blueprints/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/playground/cli/project.json b/packages/playground/cli/project.json
@@ -127,6 +127,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/playground/cli/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/playground/client/package.json b/packages/playground/client/package.json
@@ -41,5 +41,6 @@
 	"engines": {
 		"node": ">=20.18.3",
 		"npm": ">=10.1.0"
-	}
+	},
+	"dependencies": {}
 }
diff --git a/packages/playground/client/project.json b/packages/playground/client/project.json
@@ -82,6 +82,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/playground/client/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/playground/common/project.json b/packages/playground/common/project.json
@@ -70,6 +70,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/playground/common/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/playground/components/project.json b/packages/playground/components/project.json
@@ -81,6 +81,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/playground/components/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/playground/remote/project.json b/packages/playground/remote/project.json
@@ -78,6 +78,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/playground/remote/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/playground/storage/project.json b/packages/playground/storage/project.json
@@ -49,6 +49,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/playground/storage/**/*.ts"],
 				"maxWarnings": 0
 			}
diff --git a/packages/playground/sync/project.json b/packages/playground/sync/project.json
@@ -83,6 +83,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": [
 					"packages/playground/sync/**/*.{ts,tsx,js,jsx}"
 				],
diff --git a/packages/playground/website/playwright/e2e/blueprints.spec.ts b/packages/playground/website/playwright/e2e/blueprints.spec.ts
@@ -251,7 +251,14 @@ test('Intl functions should work when intl is enabled', async ({
 test('HTTPS requests via curl_exec() should work', async ({
 	website,
 	wordpress,
+	browserName,
 }) => {
+	test.skip(
+		browserName === 'firefox' || browserName === 'webkit',
+		`The curl_exec() tests often fail in CI on Firefox and WebKit. The root cause is unknown, ` +
+			'but the issue does not occur in local testing or on https://playground.wordpress.net/. ' +
+			'Perhaps it is something highly specific to the CI runtime.'
+	);
 	const blueprint: Blueprint = {
 		landingPage: '/curl-test.php',
 		features: { networking: true },
@@ -555,6 +562,13 @@ test('should correctly redirect to a multisite wp-admin url', async ({
 		wordpress,
 		browserName,
 	}) => {
+		test.skip(
+			(wpVersion === 'nightly' || wpVersion === 'beta') &&
+				(browserName === 'firefox' || browserName === 'webkit'),
+			`The translation tests often fail in CI on Firefox and WebKit. The root cause is unknown, ` +
+				'but the issue does not occur in local testing or on https://playground.wordpress.net/. ' +
+				'Perhaps it is something highly specific to the CI runtime.'
+		);
 		const blueprint: Blueprint = {
 			landingPage: '/wp-admin/',
 			preferredVersions: {
diff --git a/packages/playground/website/project.json b/packages/playground/website/project.json
@@ -99,6 +99,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": [
 					"packages/playground/website/**/*.{ts,tsx,js,jsx}"
 				],
diff --git a/packages/playground/wordpress-builds/project.json b/packages/playground/wordpress-builds/project.json
@@ -116,6 +116,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": [
 					"packages/playground/wordpress-builds/**/*.ts",
 					"packages/playground/wordpress-builds/package.json"
diff --git a/packages/playground/wordpress-builds/public/wp-nightly/wordpress-static.zip b/packages/playground/wordpress-builds/public/wp-nightly/wordpress-static.zip
diff --git a/packages/playground/wordpress-builds/src/sqlite-database-integration/get-sqlite-driver-module-details.ts b/packages/playground/wordpress-builds/src/sqlite-database-integration/get-sqlite-driver-module-details.ts
@@ -19,10 +19,11 @@ export function getSqliteDriverModuleDetails(
 	url: string;
 } {
 	switch (version) {
+		
 		case 'develop':
 			/** @ts-ignore */
 			return {
-				size: 215168,
+				size: 217367,
 				url: url_develop,
 			};
 		case 'v2.1.16':
diff --git a/packages/playground/wordpress-builds/src/sqlite-database-integration/sqlite-database-integration-develop.zip b/packages/playground/wordpress-builds/src/sqlite-database-integration/sqlite-database-integration-develop.zip
diff --git a/packages/playground/wordpress-builds/src/wordpress/get-wordpress-module-details.ts b/packages/playground/wordpress-builds/src/wordpress/get-wordpress-module-details.ts
@@ -28,7 +28,7 @@ export function getWordPressModuleDetails(wpVersion: string = "6.8"): { size: nu
 		case 'nightly':
 			/** @ts-ignore */
 			return {
-				size: 24733320,
+				size: 24733333,
 				url: url_nightly,
 			};
 			
diff --git a/packages/playground/wordpress-builds/src/wordpress/wp-nightly.zip b/packages/playground/wordpress-builds/src/wordpress/wp-nightly.zip
diff --git a/packages/playground/wordpress/project.json b/packages/playground/wordpress/project.json
@@ -74,6 +74,7 @@
 			"executor": "@nx/linter:eslint",
 			"outputs": ["{options.outputFile}"],
 			"options": {
+				"useFlatConfig": false,
 				"lintFilePatterns": ["packages/playground/wordpress/**/*.ts"],
 				"maxWarnings": 0
 			}

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@`
`83`	`83`	`"executor": "@nx/linter:eslint",`
`84`	`84`	`"outputs": ["{options.outputFile}"],`
`85`	`85`	`"options": {`
	`86`	`+ "useFlatConfig": false,`
`86`	`87`	`"lintFilePatterns": ["packages/docs/site/*/.ts"],`
`87`	`88`	`"maxWarnings": 0`
`88`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@`
`99`	`99`	`"executor": "@nx/linter:eslint",`
`100`	`100`	`"outputs": ["{options.outputFile}"],`
`101`	`101`	`"options": {`
	`102`	`+ "useFlatConfig": false,`
`102`	`103`	`"lintFilePatterns": ["packages/php-wasm/cli/*/.ts"],`
`103`	`104`	`"maxWarnings": 0`
`104`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@`
`62`	`62`	`"executor": "@nx/linter:eslint",`
`63`	`63`	`"outputs": ["{options.outputFile}"],`
`64`	`64`	`"options": {`
	`65`	`+ "useFlatConfig": false,`
`65`	`66`	`"lintFilePatterns": ["packages/php-wasm/fs-journal/*/.ts"],`
`66`	`67`	`"maxWarnings": 0`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@`
`60`	`60`	`"executor": "@nx/linter:eslint",`
`61`	`61`	`"outputs": ["{options.outputFile}"],`
`62`	`62`	`"options": {`
	`63`	`+ "useFlatConfig": false,`
`63`	`64`	`"lintFilePatterns": ["packages/php-wasm/logger/*/.ts"],`
`64`	`65`	`"maxWarnings": 0`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -314,6 +314,7 @@`
`314`	`314`	`"executor": "@nx/linter:eslint",`
`315`	`315`	`"outputs": ["{options.outputFile}"],`
`316`	`316`	`"options": {`
	`317`	`+ "useFlatConfig": false,`
`317`	`318`	`"lintFilePatterns": ["packages/php-wasm/node/*/.ts"],`
`318`	`319`	`"maxWarnings": 0`
`319`	`320`	`}`