[AssetMapper] Fix resolving jsdeliver default + other exports from modules

ogizanagi · ogizanagi · commit 916daf0ffa62 · 2023-11-16T19:22:41.000+01:00
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php
@@ -26,7 +26,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+|\*\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 HttpClientInterface $httpClient;
 
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php
@@ -497,11 +497,12 @@ public function testImportRegex(string $subject, array $expectedPackages)
     public static function provideImportRegex(): iterable
     {
         yield 'standard import format' => [
-            'import{Color as t}from"/npm/@kurkle/color@0.3.2/+esm";import t from"/npm/jquery@3.7.0/+esm";import e from"/npm/popper.js@1.16.1/+esm";console.log("yo");',
+            'import{Color as t}from"/npm/@kurkle/color@0.3.2/+esm";import t from"/npm/jquery@3.7.0/+esm";import e from"/npm/popper.js@1.16.1/+esm";console.log("yo");import i,{Headers as a}from"/npm/@supabase/node-fetch@2.6.14/+esm";',
             [
                 ['@kurkle/color', '0.3.2'],
                 ['jquery', '3.7.0'],
                 ['popper.js', '1.16.1'],
+                ['@supabase/node-fetch', '2.6.14'],
             ],
         ];
 

Original file line number	Diff line number	Diff line change
`@@ -497,11 +497,12 @@ public function testImportRegex(string $subject, array $expectedPackages)`
`497`	`497`	`public static function provideImportRegex(): iterable`
`498`	`498`	`{`
`499`	`499`	`yield 'standard import format' => [`
`500`		`- 'import{Color as t}from"/npm/@kurkle/color@0.3.2/+esm";import t from"/npm/jquery@3.7.0/+esm";import e from"/npm/popper.js@1.16.1/+esm";console.log("yo");',`
	`500`	`+ 'import{Color as t}from"/npm/@kurkle/color@0.3.2/+esm";import t from"/npm/jquery@3.7.0/+esm";import e from"/npm/popper.js@1.16.1/+esm";console.log("yo");import i,{Headers as a}from"/npm/@supabase/node-fetch@2.6.14/+esm";',`
`501`	`501`	`[`
`502`	`502`	`['@kurkle/color', '0.3.2'],`
`503`	`503`	`['jquery', '3.7.0'],`
`504`	`504`	`['popper.js', '1.16.1'],`
	`505`	`+ ['@supabase/node-fetch', '2.6.14'],`
`505`	`506`	`],`
`506`	`507`	`];`
`507`	`508`