bug #58046 [AssetMapper] Fix JsDeliver import regexp (smnandre)

nicolas-grekas · nicolas-grekas · commit 93e881469152 · 2024-08-21T17:31:10.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [AssetMapper] Fix JsDeliver import regexp | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #57969 | License | MIT Following import were not handled in the JSDeliverEsmResolver, due to the `$` character. ```js import jQuery$1 from "/npm/jquery@3.7.0/+esm"; ``` This PR updates the regex to handle this case. Commits ------- 45f3835 [AssetMapper] Fix JsDeliver import regexp
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php
@@ -28,7 +28,7 @@ final class JsDelivrEsmResolver implements PackageResolverInterface
     public const URL_PATTERN_DIST = self::URL_PATTERN_DIST_CSS.'/+esm';
     public const URL_PATTERN_ENTRYPOINT = 'https://data.jsdelivr.com/v1/packages/npm/%s@%s/entrypoints';
 
-    public const IMPORT_REGEX = '#(?:import\s*(?:\w+,)?(?:(?:\{[^}]*\}|\w+|\*\s*as\s+\w+)\s*\bfrom\s*)?|export\s*(?:\{[^}]*\}|\*)\s*from\s*)("/npm/((?:@[^/]+/)?[^@]+?)(?:@([^/]+))?((?:/[^/]+)*?)/\+esm")#';
+    public const IMPORT_REGEX = '#(?:import\s*(?:[\w$]+,)?(?:(?:\{[^}]*\}|[\w$]+|\*\s*as\s+[\w$]+)\s*\bfrom\s*)?|export\s*(?:\{[^}]*\}|\*)\s*from\s*)("/npm/((?:@[^/]+/)?[^@]+?)(?:@([^/]+))?((?:/[^/]+)*?)/\+esm")#';
 
     private const ES_MODULE_SHIMS = 'es-module-shims';
 
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php
@@ -686,6 +686,13 @@ public static function provideImportRegex(): iterable
                 ['datatables.net-select', '1.7.0'],
             ],
         ];
+
+        yield 'import with name containing a dollar sign' => [
+            'import jQuery$1 from "/npm/jquery@3.7.0/+esm";',
+            [
+                ['jquery', '3.7.0'],
+            ],
+        ];
     }
 
     private static function createRemoteEntry(string $importName, string $version, ImportMapType $type = ImportMapType::JS, ?string $packageSpecifier = null): ImportMapEntry
