Rework update logic import

Author: tuna2smc

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

@@ -135,21 +135,30 @@ 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 = (bool)$this->deploymentConfig->get(self::CONFIG_PATH_SCD_ONLY_ENABLED_MODULES);
+            $deployOnlyEnabled = $this->getStaticDeployEnabledModulesFlag();
             /** @var $importFile \Magento\Framework\View\File */
             foreach ($importFiles as $importFile) {
                 $moduleName = $importFile->getModule();
 
-                if ($moduleName && $deployOnlyEnabled && !$this->moduleManager->isEnabled($moduleName)) {
-                    continue;
-                }
-                
-                if (!$deployOnlyEnabled || ($moduleName && $deployOnlyEnabled && $this->moduleManager->isEnabled($moduleName))) {
+                if (!$deployOnlyEnabled) {
                     $referenceString = $isReference ? '(reference) ' : '';
                     $importsContent .= $moduleName
                         ? "@import $referenceString'{$moduleName}::{$resolvedPath}';\n"
                         : "@import $referenceString'{$matchedFileId}';\n";
                 }
+
+                if ($deployOnlyEnabled) {
+                    if ($moduleName && !$this->moduleManager->isEnabled($moduleName)) {
+                        continue;
+                    }
+
+                    if ($moduleName && $this->moduleManager->isEnabled($moduleName)) {
+                        $referenceString = $isReference ? '(reference) ' : '';
+                        $importsContent .= $moduleName
+                            ? "@import $referenceString'{$moduleName}::{$resolvedPath}';\n"
+                            : "@import $referenceString'{$matchedFileId}';\n";
+                    }
+                }
             }
         } catch (\LogicException $e) {
             $this->errorHandler->processException($e);
@@ -158,6 +167,16 @@ protected function replace(array $matchedContent, LocalInterface $asset)
         return $importsContent;
     }
 
+    /**
+     * Retrieve flag deploy enabled modules
+     *
+     * @return bool
+     */
+    protected function getStaticDeployEnabledModulesFlag() : bool
+    {
+        return (bool) $this->deploymentConfig->get(self::CONFIG_PATH_SCD_ONLY_ENABLED_MODULES);
+    }
+
     /**
      * Get theme model based on the information from asset
      *