bug #62054 [AssetMapper] Fix parsing @import that don't use url() (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 0ee8e85fa95f · 2025-10-15T10:18:29.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [AssetMapper] Fix parsing `@import` that don't use url() | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #60729 #57596 | License | MIT Commits ------- 6fb1052 [AssetMapper] Fix parsing `@import` that don't use url()
diff --git a/src/Symfony/Component/AssetMapper/Compiler/CssAssetUrlCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/CssAssetUrlCompiler.php
@@ -24,8 +24,16 @@
  */
 final class CssAssetUrlCompiler implements AssetCompilerInterface
 {
-    // https://regex101.com/r/BOJ3vG/1
-    public const ASSET_URL_PATTERN = '/url\(\s*["\']?(?!(?:\/|\#|%23|data|http|\/\/))([^"\'\s?#)]+)([#?][^"\')]+)?\s*["\']?\)/';
+    // https://regex101.com/r/BOJ3vG/2
+    public const ASSET_URL_PATTERN = <<<'REGEX'
+        {
+            (?|
+            (url\()\s*+["']?(?!(?:/|\#|%23|data|http|//))([^"')\s?#]++)(?:[?#][^"')]++)?["']?\s*+(\))
+            |
+            (@import\s++)["'](?!(?:/|\#|%23|data|http|//))([^"')\s?#]++)(?:[?#][^"')]++)?["']
+            )
+        }x
+        REGEX;
 
     public function __construct(
         private readonly string $missingImportMode = self::MISSING_IMPORT_WARN,
@@ -62,16 +70,16 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
             }
 
             try {
-                $resolvedSourcePath = Path::join(\dirname($asset->sourcePath), $matches[1]);
+                $resolvedSourcePath = Path::join(\dirname($asset->sourcePath), $matches[2][0]);
             } catch (RuntimeException $e) {
                 $this->handleMissingImport(\sprintf('Error processing import in "%s": ', $asset->sourcePath).$e->getMessage(), $e);
 
-                return $matches[0];
+                return $matches[0][0];
             }
             $dependentAsset = $assetMapper->getAssetFromSourcePath($resolvedSourcePath);
 
             if (null === $dependentAsset) {
-                $message = \sprintf('Unable to find asset "%s" referenced in "%s". The file "%s" ', $matches[1], $asset->sourcePath, $resolvedSourcePath);
+                $message = \sprintf('Unable to find asset "%s" referenced in "%s". The file "%s" ', $matches[2][0], $asset->sourcePath, $resolvedSourcePath);
                 if (is_file($resolvedSourcePath)) {
                     $message .= 'exists, but it is not in a mapped asset path. Add it to the "paths" config.';
                 } else {
@@ -80,14 +88,14 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
                 $this->handleMissingImport($message);
 
                 // return original, unchanged path
-                return $matches[0];
+                return $matches[0][0];
             }
 
             $asset->addDependency($dependentAsset);
             $relativePath = Path::makeRelative($dependentAsset->publicPath, \dirname($asset->publicPathWithoutDigest));
 
-            return 'url("'.$relativePath.'")';
-        }, $content);
+            return $matches[1][0].'"'.$relativePath.'"'.($matches[3][0] ?? '');
+        }, $content, -1, $count, \PREG_OFFSET_CAPTURE);
     }
 
     public function supports(MappedAsset $asset): bool
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php
@@ -318,7 +318,7 @@ private function makeImportsBare(string $content, array &$dependencies, array &$
         }
 
         preg_match_all(CssAssetUrlCompiler::ASSET_URL_PATTERN, $content, $matches);
-        foreach ($matches[1] as $path) {
+        foreach ($matches[2] as $path) {
             if (str_starts_with($path, 'data:')) {
                 continue;
             }
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/CssAssetUrlCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/CssAssetUrlCompilerTest.php
@@ -62,14 +62,12 @@ public static function provideCompileTests(): iterable
                 body {
                     background: url("images/foo.png");
                 }
-                EOF
-            ,
+                EOF,
             'expectedOutput' => <<<EOF
                 body {
                     background: url("images/foo.123456.png");
                 }
-                EOF
-            ,
+                EOF,
             'expectedDependencies' => ['images/foo.png'],
         ];
 
@@ -144,6 +142,80 @@ public static function provideCompileTests(): iterable
             }',
             'expectedDependencies' => ['images/foo.png'],
         ];
+
+        yield 'import_without_url_double_quotes' => [
+            'input' => '@import "more-styles.css"',
+            'expectedOutput' => '@import "more-styles.abcd123.css"',
+            'expectedDependencies' => ['more-styles.css'],
+        ];
+
+        yield 'import_without_url_single_quotes' => [
+            'input' => "@import 'more-styles.css'",
+            'expectedOutput' => '@import "more-styles.abcd123.css"',
+            'expectedDependencies' => ['more-styles.css'],
+        ];
+
+        yield 'import_without_url_with_media_query' => [
+            'input' => '@import "more-styles.css" screen',
+            'expectedOutput' => '@import "more-styles.abcd123.css" screen',
+            'expectedDependencies' => ['more-styles.css'],
+        ];
+
+        yield 'import_without_url_with_media_query_single_quotes' => [
+            'input' => "@import 'more-styles.css' screen and (max-width: 600px)",
+            'expectedOutput' => '@import "more-styles.abcd123.css" screen and (max-width: 600px)',
+            'expectedDependencies' => ['more-styles.css'],
+        ];
+
+        yield 'import_without_url_with_dot_slash' => [
+            'input' => '@import "./more-styles.css"',
+            'expectedOutput' => '@import "more-styles.abcd123.css"',
+            'expectedDependencies' => ['more-styles.css'],
+        ];
+
+        yield 'import_without_url_with_dot_dot_slash' => [
+            'input' => '@import "../assets/more-styles.css"',
+            'expectedOutput' => '@import "more-styles.abcd123.css"',
+            'expectedDependencies' => ['more-styles.css'],
+        ];
+
+        yield 'import_without_url_absolute_path_ignored' => [
+            'input' => '@import "/path/to/more-styles.css"',
+            'expectedOutput' => '@import "/path/to/more-styles.css"',
+            'expectedDependencies' => [],
+        ];
+
+        yield 'import_without_url_http_url_ignored' => [
+            'input' => '@import "https://cdn.io/more-styles.css"',
+            'expectedOutput' => '@import "https://cdn.io/more-styles.css"',
+            'expectedDependencies' => [],
+        ];
+
+        yield 'import_without_url_data_uri_ignored' => [
+            'input' => '@import "data:text/css;base64,LmJvZHkgeyBiYWNrZ3JvdW5kOiByZWQ7IH0="',
+            'expectedOutput' => '@import "data:text/css;base64,LmJvZHkgeyBiYWNrZ3JvdW5kOiByZWQ7IH0="',
+            'expectedDependencies' => [],
+        ];
+
+        yield 'import_without_url_in_comments_ignored' => [
+            'input' => 'body { background: url("images/foo.png"); } /* @import "more-styles.css" */',
+            'expectedOutput' => 'body { background: url("images/foo.123456.png"); } /* @import "more-styles.css" */',
+            'expectedDependencies' => ['images/foo.png'],
+        ];
+
+        yield 'mixed_url_and_import_without_url' => [
+            'input' => <<<EOF
+                @import "more-styles.css";
+                body { background: url("images/foo.png"); }
+                @import url(./more-styles.css);
+                EOF,
+            'expectedOutput' => <<<EOF
+                @import "more-styles.abcd123.css";
+                body { background: url("images/foo.123456.png"); }
+                @import url("more-styles.abcd123.css");
+                EOF,
+            'expectedDependencies' => ['more-styles.css', 'images/foo.png', 'more-styles.css'],
+        ];
     }
 
     public function testCompileFindsRelativeFilesViaSourcePath()
@@ -223,5 +295,23 @@ public static function provideStrictModeTests(): iterable
             'input' => "background-image: url(\'data:image/png;base64,iVBORw0KG\')",
             'expectedExceptionMessage' => null,
         ];
+
+        yield 'importing_non_existent_file_without_url_throws_exception' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => '@import "non-existent.css"',
+            'expectedExceptionMessage' => 'Unable to find asset "non-existent.css" referenced in "/path/to/styles.css".',
+        ];
+
+        yield 'importing_absolute_file_path_without_url_is_ignored' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => '@import "/path/to/non-existent.css"',
+            'expectedExceptionMessage' => null,
+        ];
+
+        yield 'importing_a_url_without_url_is_ignored' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => '@import "https://cdn.io/non-existent.css"',
+            'expectedExceptionMessage' => null,
+        ];
     }
 }
