Skip to content

[CLI] Fix explicit, relative auto-mount for plugins and themes #2861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+19 −14
Draft

[CLI] Fix explicit, relative auto-mount for plugins and themes #2861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions packages/playground/cli/src/mounts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const ACTIVATE_FIRST_THEME_STEP = {
* Auto-mounts resolution logic:
*/
export function expandAutoMounts(args: RunCLIArgs): RunCLIArgs {
const path = args.autoMount!;
const absolutePath = path.resolve(args.autoMount!);

const mount = [...(args.mount || [])];
const mountBeforeInstall = [...(args['mount-before-install'] || [])];
Expand All @@ -125,20 +125,22 @@ export function expandAutoMounts(args: RunCLIArgs): RunCLIArgs {
],
};

if (isPluginFilename(path)) {
const pluginName = basename(path);
if (isPluginFilename(absolutePath)) {
const pluginName = basename(absolutePath);
mount.push({
hostPath: path,
hostPath: absolutePath,
vfsPath: `/wordpress/wp-content/plugins/${pluginName}`,
});
newArgs['additional-blueprint-steps'].push({
step: 'activatePlugin',
pluginPath: `/wordpress/wp-content/plugins/${basename(path)}`,
pluginPath: `/wordpress/wp-content/plugins/${basename(
absolutePath
)}`,
});
} else if (isThemeDirectory(path)) {
const themeName = basename(path);
} else if (isThemeDirectory(absolutePath)) {
const themeName = basename(absolutePath);
mount.push({
hostPath: path,
hostPath: absolutePath,
vfsPath: `/wordpress/wp-content/themes/${themeName}`,
});
newArgs['additional-blueprint-steps'].push(
Expand All @@ -152,11 +154,11 @@ export function expandAutoMounts(args: RunCLIArgs): RunCLIArgs {
themeFolderName: themeName,
}
);
} else if (containsWpContentDirectories(path)) {
} else if (containsWpContentDirectories(absolutePath)) {
/**
* Mount each wp-content file and directory individually.
*/
const files = fs.readdirSync(path);
const files = fs.readdirSync(absolutePath);
for (const file of files) {
/**
* WordPress already ships with the wp-content/index.php file
Expand All @@ -167,13 +169,16 @@ export function expandAutoMounts(args: RunCLIArgs): RunCLIArgs {
continue;
}
mount.push({
hostPath: `${path}/${file}`,
hostPath: `${absolutePath}/${file}`,
vfsPath: `/wordpress/wp-content/${file}`,
});
}
newArgs['additional-blueprint-steps'].push(ACTIVATE_FIRST_THEME_STEP);
} else if (containsFullWordPressInstallation(path)) {
mountBeforeInstall.push({ hostPath: path, vfsPath: '/wordpress' });
} else if (containsFullWordPressInstallation(absolutePath)) {
mountBeforeInstall.push({
hostPath: absolutePath,
vfsPath: '/wordpress',
});
// @TODO: If overriding another mode, throw an error or print a warning.
newArgs.mode = 'apply-to-existing-site';
newArgs['additional-blueprint-steps'].push(ACTIVATE_FIRST_THEME_STEP);
Expand All @@ -182,7 +187,7 @@ export function expandAutoMounts(args: RunCLIArgs): RunCLIArgs {
* By default, mount the current working directory as the Playground root.
* This allows users to run and PHP or HTML files using the Playground CLI.
*/
mount.push({ hostPath: path, vfsPath: '/wordpress' });
mount.push({ hostPath: absolutePath, vfsPath: '/wordpress' });
// @TODO: If overriding another mode, throw an error or print a warning.
newArgs.mode = 'mount-only';
}
Expand Down