bug symfony#52617 [AssetMapper] Fix resolving jsdeliver default + other exports from modules (ogizanagi)

fabpot · fabpot · commit 7096a1e71725 · 2023-11-25T09:32:49.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [AssetMapper] Fix resolving jsdeliver default + other exports from modules | Q | A | ------------- | --- | Branch? | 6.4  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Issues | Fix symfony#52616 | License | MIT Fixes resolving: ```js import i,{Headers as a}from"/npm/`@supabase`/node-fetch@2.6.14/+esm" ``` i.e both default export and other exports in a same `import`. Commits ------- 916daf0 [AssetMapper] Fix resolving jsdeliver default + other exports from modules
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+|\*\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
@@ -610,11 +610,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
`@@ -610,11 +610,12 @@ public function testImportRegex(string $subject, array $expectedPackages)`
`610`	`610`	`public static function provideImportRegex(): iterable`
`611`	`611`	`{`
`612`	`612`	`yield 'standard import format' => [`
`613`		`- '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");',`
	`613`	`+ '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";',`
`614`	`614`	`[`
`615`	`615`	`['@kurkle/color', '0.3.2'],`
`616`	`616`	`['jquery', '3.7.0'],`
`617`	`617`	`['popper.js', '1.16.1'],`
	`618`	`+ ['@supabase/node-fetch', '2.6.14'],`
`618`	`619`	`],`
`619`	`620`	`];`
`620`	`621`