Merge remote-tracking branch '32922/add-logic-check-imports-less-for-enabled-modules' into comm_prs_248beta1

Author: Indraniks

lib/internal/Magento/Framework/Css/PreProcessor/Instruction/MagentoImport.php

@@ -3,17 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Css\PreProcessor\Instruction;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Css\PreProcessor\ErrorHandlerInterface;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\View\Asset\File\FallbackContext;
 use Magento\Framework\View\Asset\LocalInterface;
 use Magento\Framework\View\Asset\PreProcessorInterface;
+use Magento\Framework\View\Asset\Repository as AssetRepository;
+use Magento\Framework\View\Design\Theme\ListInterface as ThemeListInterface;
 use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
+use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\DesignInterface;
 use Magento\Framework\View\File\CollectorInterface;
+use Magento\Framework\View\Asset\PreProcessor\Chain;
 
 /**
  * @magento_import instruction preprocessor
@@ -27,6 +35,8 @@ class MagentoImport implements PreProcessorInterface, ResetAfterRequestInterface
     public const REPLACE_PATTERN =
         '#//@magento_import(?P<reference>\s+\(reference\))?\s+[\'\"](?P<path>(?![/\\\]|\w:[/\\\])[^\"\']+)[\'\"]\s*?;#';
 
+    private const CONFIG_PATH_SCD_ONLY_ENABLED_MODULES = 'static_content_only_enabled_modules';
+
     /**
      * @var DesignInterface
      */
@@ -43,12 +53,12 @@ class MagentoImport implements PreProcessorInterface, ResetAfterRequestInterface
     protected $errorHandler;
 
     /**
-     * @var \Magento\Framework\View\Asset\Repository
+     * @var AssetRepository
      */
     protected $assetRepo;
 
     /**
-     * @var \Magento\Framework\View\Design\Theme\ListInterface
+     * @var ThemeListInterface
      * @deprecated 100.0.2
      * @see not used
      */
@@ -59,31 +69,47 @@ class MagentoImport implements PreProcessorInterface, ResetAfterRequestInterface
      */
     private $themeProvider;
 
+    /**
+     * @var DeploymentConfig
+     */
+    private DeploymentConfig $deploymentConfig;
+
+    /**
+     * @var ModuleManager
+     */
+    private ModuleManager $moduleManager;
+
     /**
      * @param DesignInterface $design
      * @param CollectorInterface $fileSource
      * @param ErrorHandlerInterface $errorHandler
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @param \Magento\Framework\View\Design\Theme\ListInterface $themeList
+     * @param AssetRepository $assetRepo
+     * @param ThemeListInterface $themeList
+     * @param DeploymentConfig|null $deploymentConfig
+     * @param ModuleManager|null $moduleManager
      */
     public function __construct(
         DesignInterface $design,
         CollectorInterface $fileSource,
         ErrorHandlerInterface $errorHandler,
-        \Magento\Framework\View\Asset\Repository $assetRepo,
-        \Magento\Framework\View\Design\Theme\ListInterface $themeList
+        AssetRepository $assetRepo,
+        ThemeListInterface $themeList,
+        ?DeploymentConfig $deploymentConfig = null,
+        ?ModuleManager $moduleManager = null
     ) {
         $this->design = $design;
         $this->fileSource = $fileSource;
         $this->errorHandler = $errorHandler;
         $this->assetRepo = $assetRepo;
         $this->themeList = $themeList;
+        $this->deploymentConfig = $deploymentConfig ?? ObjectManager::getInstance() ->get(DeploymentConfig::class);
+        $this->moduleManager = $moduleManager ?? ObjectManager::getInstance()->get(ModuleManager::class);
     }
 
     /**
      * @inheritDoc
      */
-    public function process(\Magento\Framework\View\Asset\PreProcessor\Chain $chain)
+    public function process(Chain $chain)
     {
         $asset = $chain->getAsset();
         $replaceCallback = function ($matchContent) use ($asset) {
@@ -108,24 +134,42 @@ protected function replace(array $matchedContent, LocalInterface $asset)
             $relatedAsset = $this->assetRepo->createRelated($matchedFileId, $asset);
             $resolvedPath = $relatedAsset->getFilePath();
             $importFiles = $this->fileSource->getFiles($this->getTheme($relatedAsset), $resolvedPath);
+            $deployOnlyEnabled = $this->hasEnabledFlagDeployEnabledModules();
             /** @var $importFile \Magento\Framework\View\File */
             foreach ($importFiles as $importFile) {
+                $moduleName = $importFile->getModule();
                 $referenceString = $isReference ? '(reference) ' : '';
-                $importsContent .= $importFile->getModule()
-                    ? "@import $referenceString'{$importFile->getModule()}::{$resolvedPath}';\n"
-                    : "@import $referenceString'{$matchedFileId}';\n";
+
+                if ($moduleName) {
+                    if (!$deployOnlyEnabled || $this->moduleManager->isEnabled($moduleName)) {
+                        $importsContent .= "@import $referenceString'{$moduleName}::{$resolvedPath}';\n";
+                    }
+                } else {
+                    $importsContent .= "@import $referenceString'{$matchedFileId}';\n";
+                }
             }
         } catch (\LogicException $e) {
             $this->errorHandler->processException($e);
         }
+
         return $importsContent;
     }
 
+    /**
+     * Retrieve flag deploy enabled modules
+     *
+     * @return bool
+     */
+    private function hasEnabledFlagDeployEnabledModules(): bool
+    {
+        return (bool) $this->deploymentConfig->get(self::CONFIG_PATH_SCD_ONLY_ENABLED_MODULES);
+    }
+
     /**
      * Get theme model based on the information from asset
      *
      * @param LocalInterface $asset
-     * @return \Magento\Framework\View\Design\ThemeInterface
+     * @return ThemeInterface
      */
     protected function getTheme(LocalInterface $asset)
     {
@@ -135,6 +179,7 @@ protected function getTheme(LocalInterface $asset)
                 $context->getAreaCode() . '/' . $context->getThemePath()
             );
         }
+
         return $this->design->getDesignTheme();
     }
 
@@ -143,7 +188,7 @@ protected function getTheme(LocalInterface $asset)
      *
      * @return ThemeProviderInterface
      */
-    private function getThemeProvider()
+    private function getThemeProvider(): ThemeProviderInterface
     {
         if (null === $this->themeProvider) {
             $this->themeProvider = ObjectManager::getInstance()->get(ThemeProviderInterface::class);