fix: do a better job cleaning up unnecessary files

carlalexander · carlalexander · commit 8730c63d3946 · 2020-12-03T15:01:59.000-05:00
diff --git a/src/Build/CompressBuildFilesStep.php b/src/Build/CompressBuildFilesStep.php
@@ -59,12 +59,15 @@ public function perform(string $environment, ProjectConfiguration $projectConfig
         $archive = new \ZipArchive();
         $archive->open($this->buildArtifactPath, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
         $environment = (array) $projectConfiguration->getEnvironment($environment);
-
         $files = Finder::create()
                        ->append($this->getRequiredFiles())
                        ->append($this->getRequiredFileTypes())
                        ->append($this->getWordPressCoreFiles($projectConfiguration->getProjectType()));
 
+        if ('bedrock' === $projectConfiguration->getProjectType()) {
+            $files->exclude(['web/wp/wp-content']);
+        }
+
         if (Arr::has($environment, 'build.include')) {
             $files->append($this->getIncludedFiles(Arr::get($environment, 'build.include')));
         }
diff --git a/src/Build/CopyWordPressFilesStep.php b/src/Build/CopyWordPressFilesStep.php
@@ -71,11 +71,14 @@ public function perform(string $environment, ProjectConfiguration $projectConfig
 
         $this->filesystem->mkdir($this->buildDirectory, 0755);
 
-        foreach ($this->getProjectFiles($projectConfiguration->getProjectType()) as $file) {
-            $this->copyFile($file);
+        $environment = (array) $projectConfiguration->getEnvironment($environment);
+        $files = $this->getProjectFiles($projectConfiguration->getProjectType());
+
+        if (Arr::has($environment, 'build.include')) {
+            $files->append($this->getIncludedFiles(Arr::get($environment, 'build.include')));
         }
 
-        foreach ($this->getIncludedFiles(Arr::get((array) $projectConfiguration->getEnvironment($environment), 'build.include', [])) as $file) {
+        foreach ($files as $file) {
             $this->copyFile($file);
         }
     }
diff --git a/src/Build/ExtractAssetFilesStep.php b/src/Build/ExtractAssetFilesStep.php
@@ -76,22 +76,20 @@ public function perform(string $environment, ProjectConfiguration $projectConfig
             $fromDirectory .= '/web';
         }
 
-        foreach ($this->getAssetFiles($fromDirectory) as $file) {
-            $this->moveAssetFile($file);
-        }
-    }
-
-    /**
-     * Get the asset files that we want to extract.
-     */
-    private function getAssetFiles(string $fromDirectory): Finder
-    {
-        return Finder::create()
+        $files = Finder::create()
             ->in($fromDirectory)
             ->files()
-            ->notName(['*.php'])
+            ->notName(['*.php', '*.mo', '*.po'])
             ->followLinks()
             ->ignoreDotFiles(true);
+
+        if ('bedrock' === $projectConfiguration->getProjectType()) {
+            $files->exclude(['wp/wp-content']);
+        }
+
+        foreach ($files as $file) {
+            $this->moveAssetFile($file);
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,14 @@ public function perform(string $environment, ProjectConfiguration $projectConfig`
`71`	`71`
`72`	`72`	`$this->filesystem->mkdir($this->buildDirectory, 0755);`
`73`	`73`
`74`		`- foreach ($this->getProjectFiles($projectConfiguration->getProjectType()) as $file) {`
`75`		`- $this->copyFile($file);`
	`74`	`+ $environment = (array) $projectConfiguration->getEnvironment($environment);`
	`75`	`+ $files = $this->getProjectFiles($projectConfiguration->getProjectType());`
	`76`	`+`
	`77`	`+ if (Arr::has($environment, 'build.include')) {`
	`78`	`+ $files->append($this->getIncludedFiles(Arr::get($environment, 'build.include')));`
`76`	`79`	`}`
`77`	`80`
`78`		`- foreach ($this->getIncludedFiles(Arr::get((array) $projectConfiguration->getEnvironment($environment), 'build.include', [])) as $file) {`
	`81`	`+ foreach ($files as $file) {`
`79`	`82`	`$this->copyFile($file);`
`80`	`83`	`}`
`81`	`84`	`}`