Add or remove theme path from composer.json on generation / clean.

Happyculture · Mar 15, 2022 · fee1920 · fee1920
1 parent cc14db1
commit fee1920
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Command/CleanProjectCommand.php b/src/Command/CleanProjectCommand.php
@@ -176,6 +176,24 @@ protected function execute(InputInterface $input, OutputInterface $output) {
       $dir = $theme_folder . '/' . $machine_name . '_theme';
       if ($this->getFs()->exists($dir)) {
         $this->getFs()->remove($dir);
+
+        // Remove the theme path in the composer.json file.
+        $prevDir = getcwd();
+        chdir($this->drupalFinder->getComposerRoot());
+        $enabledThemes = json_decode(exec('/usr/bin/env composer config extra.kumquat-themes'));
+
+        $prefix = substr($this->drupalFinder->getDrupalRoot(), strlen($this->drupalFinder->getComposerRoot()));
+        $prefix = trim($prefix, '/');
+        $key = array_search($prefix . '/' . $dir, $enabledThemes);
+        if ($key !== FALSE) {
+          unset($enabledThemes[$key]);
+        }
+
+        exec('/usr/bin/env composer config extra.kumquat-themes --json \'' . json_encode(array_unique($enabledThemes)) . '\'');
+        exec('/usr/bin/env composer update --lock');
+
+        chdir($prevDir);
+
         $this->getIo()->success(sprintf('%s front theme successfully cleaned.', $machine_name . '_theme'));
       }
       else {

diff --git a/src/Generator/ProjectGenerator.php b/src/Generator/ProjectGenerator.php
@@ -291,10 +291,15 @@ public function generateDefaultTheme(array $parameters) {
     // Add the theme path in the composer.json file.
     $prevDir = getcwd();
     chdir($this->drupalFinder->getComposerRoot());
+    $enabledThemes = json_decode(exec('/usr/bin/env composer config extra.kumquat-themes'));
+
     $prefix = substr($this->drupalFinder->getDrupalRoot(), strlen($this->drupalFinder->getComposerRoot()));
     $prefix = trim($prefix, '/');
-    exec('/usr/bin/env composer config extra.kumquat-themes.0 ' . $prefix . '/' . $defaultThemePath);
+    $enabledThemes[] = $prefix . '/' . $defaultThemePath;
+
+    exec('/usr/bin/env composer config extra.kumquat-themes --json \'' . json_encode(array_unique($enabledThemes)) . '\'');
     exec('/usr/bin/env composer update --lock');
+
     chdir($prevDir);
     $this->fileQueue->addFile('../composer.json');
     $this->countCodeLines->addCountCodeLines(1);