Merge feature/modules-to-plugins into feature/auto-sizes

.gitattributes

@@ -9,6 +9,7 @@
 /docs export-ignore
 /tests export-ignore
 /plugin-tests export-ignore
+/plugins export-ignore
 
 /*.DS_store export-ignore
 /.DS_store? export-ignore

.github/workflows/deploy-standalone-plugins.yml

@@ -50,7 +50,7 @@ jobs:
             # for use in the matrix.
             # The "dry-run" parameter is included here to set the deployment mode.
             # When running the manual (workflow_dispatch) workflow, this value will be set from manual input type.
-            echo "matrix="$(jq -c '{include:[keys[] as $k | {name:$k,slug:.[$k].slug,version:.[$k].version,"dry-run":false }]}' plugins.json) >> $GITHUB_OUTPUT
+            echo "matrix="$(jq -c '{include:[.modules | to_entries[] | {name:.key,slug:.value.slug,version:.value.version,"dry-run":false }]}' plugins.json) >> $GITHUB_OUTPUT
           fi
   deploy:
     name: Deploy Plugin

.github/workflows/php-test-plugins.yml

@@ -0,0 +1,78 @@
+name: Unit Testing for Test Plugin
+
+on:
+  push:
+    branches:
+      - trunk
+      - 'release/**'
+    # Only run if PHP-related files changed.
+    paths:
+      - '.github/workflows/php-test-plugins.yml'
+      - '**.php'
+      - '.wp-env.json'
+      - '**/package.json'
+      - 'package-lock.json'
+      - 'phpunit.xml.dist'
+      - 'tests/multisite.xml'
+      - 'composer.json'
+      - 'composer.lock'
+  pull_request:
+    branches:
+      - trunk
+      - 'release/**'
+      - 'feature/**'
+    # Only run if PHP-related files changed.
+    paths:
+      - '.github/workflows/php-test-plugins.yml'
+      - '**.php'
+      - '.wp-env.json'
+      - '**/package.json'
+      - 'package-lock.json'
+      - 'phpunit.xml.dist'
+      - 'tests/multisite.xml'
+      - 'composer.json'
+      - 'composer.lock'
+    types:
+      - opened
+      - reopened
+      - synchronize
+
+jobs:
+  php-test-plugins:
+    name: "PHP ${{ matrix.php }} / WP ${{ matrix.wp }}"
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0']
+        wp: [ 'latest' ]
+        include:
+          - php: '7.4'
+            wp: '6.3'
+          - php: '8.3'
+            wp: 'trunk'
+    env:
+      WP_ENV_PHP_VERSION: ${{ matrix.php }}
+      WP_ENV_CORE: ${{ matrix.wp == 'trunk' && 'WordPress/WordPress' || format( 'https://wordpress.org/wordpress-{0}.zip', matrix.wp ) }}
+    steps:
+      - uses: styfle/cancel-workflow-action@0.11.0
+      - uses: actions/checkout@v3
+      - name: Setup Node.js (.nvmrc)
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+          cache: npm
+      - name: npm install
+        run: npm ci
+      - name: Install WordPress
+        run: npm run wp-env start
+        # Note that `composer update` is required instead of `composer install`
+        # for the sake of PHP versions older than 8.1, which is the version of
+        # PHP that the composer.lock was created for.
+      - name: Composer update
+        run: npm run wp-env run tests-cli -- --env-cwd="wp-content/plugins/$(basename $(pwd))" composer update --no-interaction
+      - name: Running single site unit tests
+        run: npm run test-php -- -- -- --testsuite test-plugin
+      - name: Running multisite unit tests
+        run: npm run test-php-multisite -- -- -- --testsuite test-plugin

bin/plugin/commands/build-plugins.js

@@ -24,7 +24,16 @@ exports.handler = async () => {
 		}
 
 		try {
-			const plugins = JSON.parse( jsonString );
+			const pluginsConfig = JSON.parse( jsonString );
+			const plugins = pluginsConfig.modules;
+			if ( ! plugins ) {
+				log(
+					formats.error(
+						'The given module configuration is invalid, the modules are missing, or they are misspelled.'
+					)
+				);
+				return;
+			}
 			for ( const moduleDir in plugins ) {
 				const pluginVersion = plugins[ moduleDir ]?.version;
 				const pluginSlug = plugins[ moduleDir ]?.slug;

bin/plugin/commands/get-plugin-version.js

@@ -56,15 +56,25 @@ function doRunGetPluginVersion( settings ) {
 		);
 	}
 
-	const plugins = JSON.parse( pluginsFileContent );
+	const pluginsConfig = JSON.parse( pluginsFileContent );
 
 	// Check for valid and not empty object resulting from plugins JSON file parse.
-	if ( 'object' !== typeof plugins || 0 === Object.keys( plugins ).length ) {
+	if (
+		'object' !== typeof pluginsConfig ||
+		0 === Object.keys( pluginsConfig ).length
+	) {
 		throw Error(
 			`File at "${ pluginsFile }" parsed, but detected empty/non valid JSON object.`
 		);
 	}
 
+	const plugins = pluginsConfig.modules;
+	if ( ! plugins ) {
+		throw Error(
+			`File at "${ pluginsFile }" parsed, but the modules are missing, or they are misspelled.`
+		);
+	}
+
 	for ( const moduleDir in plugins ) {
 		const pluginVersion = plugins[ moduleDir ]?.version;
 		const pluginSlug = plugins[ moduleDir ]?.slug;

bin/plugin/commands/test-plugins.js

@@ -428,12 +428,12 @@ function doRunStandalonePluginTests( settings ) {
 		);
 	}
 
-	const pluginsJsonFileContentAsJson = JSON.parse( pluginsJsonFileContent );
+	const pluginsConfig = JSON.parse( pluginsJsonFileContent );
 
 	// Check for valid and not empty object resulting from plugins JSON file parse.
 	if (
-		'object' !== typeof pluginsJsonFileContentAsJson ||
-		0 === Object.keys( pluginsJsonFileContentAsJson ).length
+		'object' !== typeof pluginsConfig ||
+		0 === Object.keys( pluginsConfig ).length
 	) {
 		log(
 			formats.error(
@@ -445,24 +445,36 @@ function doRunStandalonePluginTests( settings ) {
 		process.exit( 1 );
 	}
 
+	const plugins = pluginsConfig.modules;
+	if ( ! plugins ) {
+		log(
+			formats.error(
+				'The given module configuration is invalid, the modules are missing, or they are misspelled.'
+			)
+		);
+
+		// Return with exit code 1 to trigger a failure in the test pipeline.
+		process.exit( 1 );
+	}
+
 	// Create an array of plugins from entries in plugins JSON file.
-	builtPlugins = Object.keys( pluginsJsonFileContentAsJson )
+	builtPlugins = Object.keys( plugins )
 		.filter( ( item ) => {
 			if (
 				! fs.pathExistsSync(
-					`${ settings.builtPluginsDir }${ pluginsJsonFileContentAsJson[ item ].slug }`
+					`${ settings.builtPluginsDir }${ plugins[ item ].slug }`
 				)
 			) {
 				log(
 					formats.error(
-						`Built plugin path "${ settings.builtPluginsDir }${ pluginsJsonFileContentAsJson[ item ].slug }" not found, skipping and removing from plugin list`
+						`Built plugin path "${ settings.builtPluginsDir }${ plugins[ item ].slug }" not found, skipping and removing from plugin list`
 					)
 				);
 				return false;
 			}
 			return true;
 		} )
-		.map( ( item ) => pluginsJsonFileContentAsJson[ item ].slug );
+		.map( ( item ) => plugins[ item ].slug );
 
 	// For each built plugin, copy the test assets.
 	builtPlugins.forEach( ( plugin ) => {

composer.json

@@ -25,8 +25,8 @@
     "phpstan": "build-cs/vendor/bin/phpstan analyse --memory-limit=2048M -c phpstan.neon.dist",
     "format": "build-cs/vendor/bin/phpcbf --standard=phpcs.xml.dist --report-summary --report-source",
     "lint": "build-cs/vendor/bin/phpcs --standard=phpcs.xml.dist",
-    "test": "phpunit -c phpunit.xml.dist --verbose",
-    "test-multisite": "phpunit -c tests/multisite.xml --verbose"
+    "test": "phpunit -c phpunit.xml.dist --verbose --testsuite performance-lab",
+    "test-multisite": "phpunit -c tests/multisite.xml --verbose --testsuite performance-lab"
   },
   "config": {
     "allow-plugins": {

phpcs.xml.dist

@@ -16,6 +16,7 @@
 	<file>./admin</file>
 	<file>./load.php</file>
 	<file>./modules</file>
+	<file>./plugins</file>
 	<file>./server-timing</file>
 	<file>./tests</file>
 

phpstan.neon.dist

@@ -8,6 +8,7 @@ parameters:
 		- load.php
 		- module-i18n.php
 		- modules/
+		- plugins/
 		- server-timing/
 		- tests/
 		- uninstall.php

phpunit.xml.dist

@@ -7,9 +7,13 @@
 	convertWarningsToExceptions="true"
 	>
 	<testsuites>
-		<testsuite name="default">
+		<testsuite name="performance-lab">
 			<directory suffix=".php">./tests</directory>
-    		<exclude>./tests/utils</exclude>
+			<exclude>./tests/utils</exclude>
+			<exclude>./tests/plugins</exclude>
+		</testsuite>
+		<testsuite name="test-plugin">
+			<directory suffix=".php">./tests/plugins/test-plugin</directory>
 		</testsuite>
 	</testsuites>
 	<groups>

plugins.json

@@ -1,10 +1,13 @@
 {
-  "images/dominant-color-images": {
-    "slug": "dominant-color-images",
-    "version": "1.0.1"
+  "modules": {
+    "images/dominant-color-images": {
+      "slug": "dominant-color-images",
+      "version": "1.0.1"
+    },
+    "images/webp-uploads": {
+      "slug": "webp-uploads",
+      "version": "1.0.5"
+    }
   },
-  "images/webp-uploads": {
-    "slug": "webp-uploads",
-    "version": "1.0.5"
-  }
+  "plugins": []
 }

tests/plugins/test-plugin/test-plugin.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Class Plugin Test Suite
+ *
+ * @package performance-lab
+ */
+
+/**
+ * Plugin test case.
+ */
+class PluginTest extends WP_UnitTestCase {
+
+	public function test_plugin_does_not_fatal() {
+		$this->assertTrue( true );
+	}
+
+	public function test_another_plugin_does_not_fatal() {
+		$this->assertTrue( true );
+	}
+}