[AssetMapper] Adding import support for paths without a version

weaverryan · weaverryan · commit d684020dc33d · 2023-10-27T10:07:25.000-04: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 = '{from"/npm/((?:@[^/]+/)?[^@]+)@([^/]+)((?:/[^/]+)*?)/\+esm"}';
+    public const IMPORT_REGEX = '{from"/npm/((?:@[^/]+/)?[^@]+?)(?:@([^/]+))?((?:/[^/]+)*?)/\+esm"}';
 
     private HttpClientInterface $httpClient;
 
@@ -222,7 +222,7 @@ private function fetchPackageRequirementsFromImports(string $content): array
         preg_match_all(self::IMPORT_REGEX, $content, $matches);
         $dependencies = [];
         foreach ($matches[1] as $index => $packageName) {
-            $version = $matches[2][$index];
+            $version = $matches[2][$index] ?: null;
             $packageName .= $matches[3][$index]; // add the path if any
 
             $dependencies[] = new PackageRequireOptions($packageName, $version);
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php
@@ -513,6 +513,22 @@ public static function provideImportRegex(): iterable
                 ['locutus/php/strings/vsprintf', '2.0.16'],
             ],
         ];
+
+        yield 'import statements without a version' => [
+            'import{ReplaceAroundStep as c,canSplit as d,StepMap as p,liftTarget as f}from"/npm/prosemirror-transform/+esm";import{PluginKey as h,EditorState as m,TextSelection as v,Plugin as g,AllSelection as y,Selection as b,NodeSelection as w,SelectionRange as k}from"/npm/prosemirror-state@1.4.3/+esm";',
+            [
+                ['prosemirror-transform', ''],
+                ['prosemirror-state', '1.4.3'],
+            ],
+        ];
+
+        yield 'import statements without a version and with paths' => [
+            'import{ReplaceAroundStep as c,canSplit as d,StepMap as p,liftTarget as f}from"/npm/prosemirror-transform/php/strings/vsprintf/+esm";import{PluginKey as h,EditorState as m,TextSelection as v,Plugin as g,AllSelection as y,Selection as b,NodeSelection as w,SelectionRange as k}from"/npm/prosemirror-state@1.4.3/php/strings/sprintf/+esm";',
+            [
+                ['prosemirror-transform/php/strings/vsprintf', ''],
+                ['prosemirror-state/php/strings/sprintf', '1.4.3'],
+            ],
+        ];
     }
 
     private static function createRemoteEntry(string $importName, string $version, ImportMapType $type = ImportMapType::JS, string $packageSpecifier = null): ImportMapEntry
