Merge remote-tracking branch 'origin/MAGETWO-99616' into 2.3-develop-pr24

Author: serhii-balko

app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php

@@ -69,6 +69,7 @@ public function process(Package $package, array $options)
         /** @var PackageFile $file */
         foreach (array_keys($package->getMap()) as $fileId) {
             $filePath = str_replace(\Magento\Framework\View\Asset\Repository::FILE_ID_SEPARATOR, '/', $fileId);
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             if (strtolower(pathinfo($fileId, PATHINFO_EXTENSION)) == 'css') {
                 $urlMap = $this->parseCss(
                     $urlMap,
@@ -100,6 +101,7 @@ private function parseCss(array $urlMap, $cssFilePath, $packagePath, $cssContent
     {
         $cssFilePath = $this->minification->addMinifiedSign($cssFilePath);
 
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $cssFileBasePath = pathinfo($cssFilePath, PATHINFO_DIRNAME);
         $urls = $this->getCssUrls($cssContent);
         foreach ($urls as $url) {
@@ -124,8 +126,21 @@ private function parseCss(array $urlMap, $cssFilePath, $packagePath, $cssContent
                         . str_repeat('../', count(explode('/', $cssFileBasePath)))
                         . $this->minification->addMinifiedSign($matchedFile->getDeployedFilePath())
                 ];
+            } else {
+                $filePathInBase = $package->getArea() .
+                    '/' . Package::BASE_THEME .
+                    '/' . $package->getLocale() .
+                    '/' . $lookupFileId;
+                if ($this->staticDir->isReadable($this->minification->addMinifiedSign($filePathInBase))) {
+                    $urlMap[$url][] = [
+                        'filePath' => $this->minification->addMinifiedSign($packagePath . '/' . $cssFilePath),
+                        'replace' => str_repeat('../', count(explode('/', $cssFileBasePath)) + 4)
+                            . $this->minification->addMinifiedSign($filePathInBase),
+                    ];
+                }
             }
         }
+
         return $urlMap;
     }