Playground CLI Allow /wordpress subdirs to be mounted before WP install #2382
+48
−27
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brandonpayton
added
[Type] Bug
|
Confirming that this PR fixes the issue I was having (trying to mount an existing |
bgrgicak
reviewed
Jul 18, 2025
Comment on lines
+533
to
576
| const moveRecursively = (source: string, target: string, php: PHP) => { | ||
| if (php.fileExists(target)) { | ||
| /* | ||
| * Something exists at the target path. | ||
| * Let's check to make sure we aren't copying conflicting types. | ||
| * | ||
| * In this context, if the source path points to a file and the | ||
| * target path points to a directory, we do not intend for the file | ||
| * to be moved into the directory. | ||
| */ | ||
|
|
||
| if (!php.isDir(source) && php.isDir(target)) { | ||
| throw new Error( | ||
| `The target ${target} is a directory but the source ${source} is not. This is not supported.` | ||
| ); | ||
| } | ||
| if (php.isDir(source) && !php.isDir(target)) { | ||
| throw new Error( | ||
| `The source ${source} is a directory but the target ${target} is not. This is not supported.` | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| if (isNonEmptyDir(target, php)) { | ||
| // We cannot move a directory over a non-empty directory, | ||
| // so we move the children one by one. | ||
| for (const file of php.listFiles(source)) { | ||
| const sourcePath = joinPaths(source, file); | ||
| const targetPath = joinPaths(target, file); | ||
| moveRecursively(sourcePath, targetPath, php); | ||
| } | ||
| } else { | ||
| php.mv(source, target); | ||
| } | ||
| php.rmdir(wpPath, { recursive: true }); | ||
| } else { | ||
| php.mv(wpPath, php.documentRoot); | ||
| }; | ||
| try { | ||
| moveRecursively(wpPath, php.documentRoot, php); | ||
| // Remove any directories left because there were existing dirs at the target path. | ||
| if (php.fileExists(wpPath)) { | ||
| php.rmdir(wpPath, { recursive: true }); | ||
| } | ||
| } catch (e) { | ||
| throw e; | ||
| } |
There was a problem hiding this comment.
This would fit nicely into FSHelpers, similarly to how we have copyRecursive.
There was a problem hiding this comment.
And mount tests have a bunch of FS related tests, so they could be a good fit for adding tests.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for the change, related issues
In Playground CLI, /wordpress subdirs cannot currently be mounted before WP install because unzipping the WordPress zip fails. See #2381 for details.
Fixes #2381
Implementation details
The PR allows moving WordPress source files over an existing directory structure with some restrictions.
I'm a bit concerned it could lead to folks unintentionally overwriting their own files, so I'm not 100% we should land this. But let's discuss and find a path forward.
Testing Instructions (or ideally a Blueprint)
TBD