Improve WP Project detection

.github/workflows/pr-checks.yml

@@ -66,3 +66,6 @@ jobs:
 
       - name: Build
         run: pnpm build
+
+      - name: Bundle
+        run: pnpm bundle:all

package.json

@@ -9,6 +9,7 @@
 	"type": "module",
 	"scripts": {
 		"build": "wireit",
+		"bundle:all": "wpdev bundle --all",
 		"bundle:changed": "wireit",
 		"dev": "wireit",
 		"dev:cleanup": "wireit",

plugins/wptelegram-comments/wpdev.project.js

@@ -3,10 +3,8 @@
  * @type {import("@wpsocio/wpdev").ProjectConfig['getProjectInfo']}
  */
 export const getProjectInfo = () => ({
-	title: 'WP Telegram Comments',
 	key: 'wptelegram_comments',
 	slug: 'wptelegram-comments',
-	textDomain: 'wptelegram-comments',
 });
 
 export { getBundleConfig } from '../wpdev.base.project.js';

plugins/wptelegram-login/wpdev.project.js

@@ -3,10 +3,8 @@
  * @type {import("@wpsocio/wpdev").ProjectConfig['getProjectInfo']}
  */
 export const getProjectInfo = () => ({
-	title: 'WP Telegram Login',
 	key: 'wptelegram_login',
 	slug: 'wptelegram-login',
-	textDomain: 'wptelegram-login',
 });
 
 export { getBundleConfig } from '../wpdev.base.project.js';

plugins/wptelegram-widget/wpdev.project.js

@@ -3,10 +3,8 @@
  * @type {import("@wpsocio/wpdev").ProjectConfig['getProjectInfo']}
  */
 export const getProjectInfo = () => ({
-	title: 'WP Telegram Widget',
 	key: 'wptelegram_widget',
 	slug: 'wptelegram-widget',
-	textDomain: 'wptelegram-widget',
 });
 
 export { getBundleConfig } from '../wpdev.base.project.js';

plugins/wptelegram/wpdev.project.js

@@ -3,10 +3,8 @@
  * @type {import("@wpsocio/wpdev").ProjectConfig['getProjectInfo']}
  */
 export const getProjectInfo = () => ({
-	title: 'WP Telegram',
 	key: 'wptelegram',
 	slug: 'wptelegram',
-	textDomain: 'wptelegram',
 });
 
 export { getBundleConfig } from '../wpdev.base.project.js';

tools/wpdev/src/base-commands/WithProjects.ts

@@ -4,7 +4,7 @@ import {
 	PROJECT_CONFIG_FILE_NAME,
 	ROOT_CONFIG_FILE_NAME,
 } from '../utils/config.js';
-import { WPProject, getStandalonePackage } from '../utils/tools.js';
+import { WPProject, getStandaloneProject } from '../utils/projects.js';
 import { WPMonorepo } from '../utils/wp-monorepo.js';
 import { WithRootDirAsCwd } from './WithRootDirAsCwd.js';
 
@@ -65,7 +65,7 @@ export abstract class WithProjects<
 
 			const expectedPkgJsonConfig =
 				this.cliConfig.operationMode === 'wp-monorepo'
-					? 'wpdev.belongsTo'
+					? 'wpdev.projectType'
 					: 'wpdev.isRoot';
 
 			messages.push(
@@ -99,13 +99,13 @@ export abstract class WithProjects<
 
 		if (this.cliConfig.operationMode === 'wp-monorepo') {
 			if (this.flags['from-changeset']) {
-				this.projects = this.wpMonorepo.getProjectsToRelease(
+				this.projects = await this.wpMonorepo.getProjectsToRelease(
 					this.flags['changeset-json'],
 				);
 			} else if (this.flags.all) {
-				this.projects = this.wpMonorepo.getManagedProjects();
+				this.projects = await this.wpMonorepo.getManagedProjects();
 			} else if (argv.length) {
-				this.projects = this.wpMonorepo.getProjectsByName(
+				this.projects = await this.wpMonorepo.getProjectsByName(
 					argv as Array<string>,
 				);
 			} else {
@@ -117,16 +117,18 @@ export abstract class WithProjects<
 	}
 
 	protected async detectProject() {
-		const project = await getStandalonePackage(this.commandCwd);
+		const project = await getStandaloneProject(this.commandCwd);
 
 		if (!project) {
 			throw new Error('Could not detect project.');
 		}
 
 		this.log('🔍 Detected project: ', chalk.bold(project.packageJson.name));
 
-		if (project.packageJson.wpdev?.belongsTo) {
-			this.projects = new Map([[project.packageJson.name, project]]);
+		if (project.wpdev?.projectType) {
+			this.projects = new Map([
+				[project.packageJson.name, project as WPProject],
+			]);
 
 			return;
 		}

tools/wpdev/src/commands/bundle.ts

@@ -13,13 +13,13 @@ import {
 } from '../utils/i18n.js';
 import { copyFiles, getDistIgnorePattern, zipDir } from '../utils/misc.js';
 import {
+	WPProject,
 	getNextVersion,
-	getProjectConfig,
+	getProjectBundleConfig,
 	runScript,
 } from '../utils/projects.js';
 import { updateRequirements } from '../utils/requirements.js';
 import { minifyStyles } from '../utils/styles.js';
-import { WPProject } from '../utils/tools.js';
 import { updateVersion } from '../utils/versions.js';
 
 type TaskWrapper = Parameters<ListrTask['task']>[1];
@@ -146,7 +146,9 @@ export default class Bundle extends WithProjects<typeof Bundle> {
 	async prepareForDist(project: WPProject, task: TaskWrapper) {
 		const version = this.getVersion(project, task);
 
-		const { projectInfo, bundle } = await getProjectConfig(project, version);
+		const projectInfo = project.wpdev;
+
+		const bundle = await getProjectBundleConfig(project, { version });
 
 		const outDir = this.getOutputDir(project);
 

tools/wpdev/src/commands/clean.ts

@@ -237,7 +237,9 @@ export default class Clean extends WithConfig {
 
 			// It's possible that the connected project may be a git repo
 			// So the above git commands won't work for nested git repos
-			const connectedProjects = wpMonorepo.getProjects({ connected: true });
+			const connectedProjects = await wpMonorepo.getProjects({
+				connected: true,
+			});
 
 			for (const [name, project] of connectedProjects) {
 				const files = child_process.execSync(
@@ -263,7 +265,7 @@ export default class Clean extends WithConfig {
 
 			// We do not want to delete any of the project directories in the monorepo.
 			filesToSkip = new Set(
-				[...wpMonorepo.getAllProjects()].map(([name, project]) => {
+				[...(await wpMonorepo.getAllProjects())].map(([name, project]) => {
 					return (
 						// We need posix paths for git
 						pathToPosix(project.relativeDir)

tools/wpdev/src/commands/project-info.ts

@@ -18,13 +18,13 @@ export default class ProjectInfo extends WithProjects<typeof ProjectInfo> {
 	public async run(): Promise<void> {
 		try {
 			const projects = [...this.projects].map(
-				([name, { relativeDir, dir, packageJson }]) => {
+				([name, { relativeDir, dir, packageJson, wpdev }]) => {
 					return {
 						name,
 						version: packageJson.version,
 						relativeDir,
 						dir,
-						wpdev: packageJson.wpdev,
+						wpdev,
 					};
 				},
 			);