Move PL plugin under plugins/performance-lab

.gitattributes

@@ -1,43 +1,4 @@
-*.stub linguist-language=PHP
-
-/.git export-ignore
-/.github export-ignore
-/.wordpress-org export-ignore
-/.husky export-ignore
-/node_modules export-ignore
-/vendor export-ignore
-
-/bin export-ignore
-/docs export-ignore
-/tests export-ignore
-/plugin-tests export-ignore
-/plugins export-ignore
-/plugins.json export-ignore
-
-/*.DS_store export-ignore
-/.DS_store? export-ignore
-
-/.editorconfig export-ignore
-/.eslintrc.js export-ignore
-/.nvmrc export-ignore
-/.wp-env.json export-ignore
-/composer.json export-ignore
-/composer.lock export-ignore
-/package.json export-ignore
-/package-lock.json export-ignore
-phpcs.xml.dist export-ignore
-/phpstan.neon.dist export-ignore
-/phpunit.xml.dist export-ignore
-/webpack.config.js export-ignore
+# See <https://github.com/github-linguist/linguist/blob/master/docs/overrides.md>.
 
-/CONTRIBUTING.md export-ignore
-/SECURITY.md export-ignore
-/README.md export-ignore
-
-/.gitattributes export-ignore
-/.gitignore export-ignore
-
-/modules/**/readme.txt export-ignore
-/modules/**/.wordpress-org export-ignore
-
-/plugins/**/.wordpress-org export-ignore
+# Improve highlighting for PHPStan stub files.
+*.stub linguist-language=PHP

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

@@ -67,7 +67,7 @@ jobs:
         run: npm run wp-env start
       - name: Composer Install
         run: npm run wp-env run tests-cli -- --env-cwd="wp-content/plugins/$(basename $(pwd))" composer install --no-interaction --no-progress
-      - name: Running single site unit tests for plugins
-        run: npm run test-php-plugins
-      - name: Running multisite unit tests for plugins
-        run: npm run test-php-multisite-plugins
+      - name: Running single site unit tests
+        run: npm run test-php
+      - name: Running multisite unit tests
+        run: npm run test-php-multisite

.wp-env.json

@@ -1,18 +1,21 @@
 {
   "core": null,
   "plugins": [
-    ".",
     "./plugins/auto-sizes",
     "./plugins/dominant-color-images",
     "./plugins/embed-optimizer",
     "./plugins/optimization-detective",
+    "./plugins/performance-lab",
     "./plugins/speculation-rules",
     "./plugins/webp-uploads"
   ],
   "env": {
     "tests": {
       "config": {
         "FS_METHOD": "direct"
+      },
+      "mappings": {
+        "/wp-content/plugins/performance": "."
       }
     }
   }

bin/phpcs/phpcs.ruleset.xml

@@ -131,4 +131,8 @@
 
 	<!-- Exclude built plugins and built assets in plugins. -->
 	<exclude-pattern>./build/*</exclude-pattern>
+
+	<!-- Exclude node_modules and vendor directories. -->
+	<exclude-pattern>./node_modules/*</exclude-pattern>
+	<exclude-pattern>./vendor/*</exclude-pattern>
 </ruleset>

bin/plugin/commands/readme.js

@@ -123,28 +123,25 @@ function getStableTag( readmeFilePath ) {
 async function updateReadme( settings ) {
 	const pluginRoot = path.resolve( __dirname, '../../../' );
 
-	const allPluginSlugs = [
-		'performance-lab', // TODO: Remove as of <https://github.com/WordPress/performance/pull/1182>.
-		...plugins,
-	];
-	if ( settings.plugin && ! allPluginSlugs.includes( settings.plugin ) ) {
+	if ( settings.plugin && ! plugins.includes( settings.plugin ) ) {
 		throw new Error( `Unrecognized plugin: ${ settings.plugin }` );
 	}
 
 	const pluginSlugs = [];
+
 	if ( settings.plugin ) {
 		pluginSlugs.push( settings.plugin );
 	} else {
-		pluginSlugs.push( ...allPluginSlugs );
+		pluginSlugs.push( ...plugins );
 	}
 
 	for ( const pluginSlug of pluginSlugs ) {
 		try {
-			const pluginDirectory =
-				'performance-lab' === pluginSlug // TODO: Remove this condition as of <https://github.com/WordPress/performance/pull/1182>.
-					? pluginRoot
-					: path.resolve( pluginRoot, 'plugins', pluginSlug );
-
+			const pluginDirectory = path.resolve(
+				pluginRoot,
+				'plugins',
+				pluginSlug
+			);
 			const readmeFilePath = path.resolve(
 				pluginDirectory,
 				'readme.txt'
@@ -157,6 +154,7 @@ async function updateReadme( settings ) {
 				token: settings.token,
 			} );
 			const status = updateReadmeChangelog( readmeFilePath, changelog );
+
 			log(
 				formats.success(
 					`💃 ${ pluginSlug } successfully updated for version ${ stableTag }: ${ status }`

bin/plugin/commands/since.js

@@ -32,22 +32,15 @@ exports.options = [
 exports.handler = async ( opt ) => {
 	const isAllPlugins = ! opt.plugin;
 
-	if (
-		! isAllPlugins &&
-		opt.plugin !== 'performance-lab' && // TODO: Remove this as of <https://github.com/WordPress/performance/pull/1182>.
-		! plugins.includes( opt.plugin )
-	) {
+	if ( ! isAllPlugins && ! plugins.includes( opt.plugin ) ) {
 		throw new Error(
 			`The plugin "${ opt.plugin }" is not a valid plugin managed as part of this project.`
 		);
 	}
 
+	const pluginDirectories = [];
 	const pluginRoot = path.resolve( __dirname, '../../../' );
 
-	const pluginDirectories = [];
-	if ( isAllPlugins || opt.plugin === 'performance-lab' ) {
-		pluginDirectories.push( pluginRoot ); // TODO: Remove this as of <https://github.com/WordPress/performance/pull/1182>.
-	}
 	if ( isAllPlugins ) {
 		for ( const pluginSlug of plugins ) {
 			pluginDirectories.push(
@@ -77,10 +70,6 @@ exports.handler = async ( opt ) => {
 		}
 		const version = readmeContentMatches[ 1 ];
 
-		if ( pluginDirectory === pluginRoot ) {
-			ignore.push( '**/plugins' ); // TODO: Remove this as of <https://github.com/WordPress/performance/pull/1182>.
-		}
-
 		patterns.push( `${ pluginDirectory }/**/*.php` );
 		patterns.push( `${ pluginDirectory }/**/*.js` );
 

bin/plugin/commands/versions.js

@@ -119,13 +119,8 @@ async function checkPluginDirectory( pluginDirectory ) {
  * @param {WPVersionsCommandOptions} opt Command options.
  */
 exports.handler = async ( opt ) => {
-	const pluginRoot = path.resolve( __dirname, '../../../' );
-
 	const pluginDirectories = [];
-
-	if ( ! opt.plugin || 'performance-lab' === opt.plugin ) {
-		pluginDirectories.push( pluginRoot ); // TODO: Remove this after <https://github.com/WordPress/performance/pull/1182>.
-	}
+	const pluginRoot = path.resolve( __dirname, '../../../' );
 
 	for ( const pluginSlug of plugins ) {
 		if ( ! opt.plugin || pluginSlug === opt.plugin ) {

composer.json

@@ -71,53 +71,51 @@
       "@lint:dominant-color-images",
       "@lint:embed-optimizer",
       "@lint:optimization-detective",
+      "@lint:performance-lab",
       "@lint:speculation-rules",
       "@lint:webp-uploads"
     ],
     "lint:auto-sizes": "@lint -- ./plugins/auto-sizes --standard=./plugins/auto-sizes/phpcs.xml.dist",
     "lint:dominant-color-images": "@lint -- ./plugins/dominant-color-images --standard=./plugins/dominant-color-images/phpcs.xml.dist",
     "lint:embed-optimizer": "@lint -- ./plugins/embed-optimizer --standard=./plugins/embed-optimizer/phpcs.xml.dist",
     "lint:optimization-detective": "@lint -- ./plugins/optimization-detective --standard=./plugins/optimization-detective/phpcs.xml.dist",
+    "lint:performance-lab": "@lint -- ./plugins/performance-lab --standard=./plugins/performance-lab/phpcs.xml.dist",
     "lint:speculation-rules": "@lint -- ./plugins/speculation-rules --standard=./plugins/speculation-rules/phpcs.xml.dist",
     "lint:webp-uploads": "@lint -- ./plugins/webp-uploads --standard=./plugins/webp-uploads/phpcs.xml.dist",
     "phpstan": "phpstan analyse --memory-limit=2048M",
-    "test": "phpunit --verbose --testsuite performance-lab",
-    "test-multisite": "phpunit -c tests/multisite.xml --verbose --testsuite performance-lab",
-    "test-multisite:all": [
-      "@test-multisite",
-      "@test-multisite:plugins"
-    ],
-    "test-multisite:auto-sizes": "phpunit -c tests/multisite.xml --verbose --testsuite auto-sizes",
-    "test-multisite:dominant-color-images": "phpunit -c tests/multisite.xml --verbose --testsuite dominant-color-images",
-    "test-multisite:embed-optimizer": "phpunit -c tests/multisite.xml --verbose --testsuite embed-optimizer",
-    "test-multisite:optimization-detective": "phpunit -c tests/multisite.xml --verbose --testsuite optimization-detective",
+    "test": "phpunit",
+    "test-multisite": "@test -c tests/multisite.xml",
     "test-multisite:plugins": [
       "@test-multisite:auto-sizes",
       "@test-multisite:dominant-color-images",
       "@test-multisite:embed-optimizer",
       "@test-multisite:optimization-detective",
+      "@test-multisite:performance-lab",
       "@test-multisite:speculation-rules",
       "@test-multisite:webp-uploads"
     ],
-    "test-multisite:speculation-rules": "phpunit -c tests/multisite.xml --verbose --testsuite speculation-rules",
-    "test-multisite:webp-uploads": "phpunit -c tests/multisite.xml --verbose --testsuite webp-uploads",
-    "test:all": [
-      "@test",
-      "@test:plugins"
-    ],
-    "test:auto-sizes": "phpunit --verbose --testsuite auto-sizes",
-    "test:dominant-color-images": "phpunit --verbose --testsuite dominant-color-images",
-    "test:embed-optimizer": "phpunit --verbose --testsuite embed-optimizer",
-    "test:optimization-detective": "phpunit --verbose --testsuite optimization-detective",
+    "test-multisite:auto-sizes": "@test-multisite --verbose --testsuite auto-sizes",
+    "test-multisite:dominant-color-images": "@test-multisite --verbose --testsuite dominant-color-images",
+    "test-multisite:embed-optimizer": "@test-multisite --verbose --testsuite embed-optimizer",
+    "test-multisite:optimization-detective": "@test-multisite --verbose --testsuite optimization-detective",
+    "test-multisite:performance-lab": "@test-multisite --verbose --testsuite performance-lab",
+    "test-multisite:speculation-rules": "@test-multisite --verbose --testsuite speculation-rules",
+    "test-multisite:webp-uploads": "@test-multisite --verbose --testsuite webp-uploads",
     "test:plugins": [
       "@test:auto-sizes",
       "@test:dominant-color-images",
       "@test:embed-optimizer",
       "@test:optimization-detective",
+      "@test:performance-lab",
       "@test:speculation-rules",
       "@test:webp-uploads"
     ],
-    "test:speculation-rules": "phpunit --verbose --testsuite speculation-rules",
-    "test:webp-uploads": "phpunit --verbose --testsuite webp-uploads"
+    "test:auto-sizes": "@test --verbose --testsuite auto-sizes",
+    "test:dominant-color-images": "@test --verbose --testsuite dominant-color-images",
+    "test:embed-optimizer": "@test --verbose --testsuite embed-optimizer",
+    "test:optimization-detective": "@test --verbose --testsuite optimization-detective",
+    "test:performance-lab": "@test --verbose --testsuite performance-lab",
+    "test:speculation-rules": "@test --verbose --testsuite speculation-rules",
+    "test:webp-uploads": "@test --verbose --testsuite webp-uploads"
   }
 }

package.json

@@ -30,8 +30,8 @@
     "readme": "./bin/plugin/cli.js readme",
     "versions": "./bin/plugin/cli.js versions",
     "build": "wp-scripts build",
-    "build-plugins": "npm-run-all 'build:plugin:!(performance-lab)'",
-    "build:plugin:performance-lab": "rm -rf build/performance-lab && mkdir -p build/performance-lab && git archive HEAD | tar -x -C build/performance-lab",
+    "build-plugins": "npm-run-all 'build:plugin:*'",
+    "build:plugin:performance-lab": "webpack --mode production --env plugin=performance-lab",
     "build:plugin:auto-sizes": "webpack --mode production --env plugin=auto-sizes",
     "build:plugin:dominant-color-images": "webpack --mode production --env plugin=dominant-color-images",
     "build:plugin:embed-optimizer": "webpack --mode production --env plugin=embed-optimizer",
@@ -43,10 +43,8 @@
     "format-php": "composer format",
     "phpstan": "composer phpstan",
     "lint-php": "composer lint:all",
-    "test-php": "wp-env run tests-cli --env-cwd=/var/www/html/wp-content/plugins/$(basename $(pwd)) composer test",
-    "test-php-multisite": "wp-env run tests-cli --env-cwd=/var/www/html/wp-content/plugins/$(basename $(pwd)) composer test-multisite",
-    "test-php-plugins": "wp-env run tests-cli --env-cwd=/var/www/html/wp-content/plugins/$(basename $(pwd)) composer test:plugins",
-    "test-php-multisite-plugins": "wp-env run tests-cli --env-cwd=/var/www/html/wp-content/plugins/$(basename $(pwd)) composer test-multisite:plugins",
+    "test-php": "wp-env run tests-cli --env-cwd=/var/www/html/wp-content/plugins/performance composer test:plugins",
+    "test-php-multisite": "wp-env run tests-cli --env-cwd=/var/www/html/wp-content/plugins/performance composer test-multisite:plugins",
     "wp-env": "wp-env",
     "prepare": "husky install"
   },