Merge branch '6.3' into 6.4

* 6.3:
  [AssetMapper] Fix wiring resolvers, send requests in parallel and use readonly properties in MappedAsset
  [AssetMapper] Change default importmap "provider" to JsDelivr+esm

Author: nicolas-grekas

DependencyInjection/Compiler/UnusedTagsPass.php

@@ -25,6 +25,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'annotations.cached_reader',
         'assets.package',
         'asset_mapper.compiler',
+        'asset_mapper.importmap.resolver',
         'auto_alias',
         'cache.pool',
         'cache.pool.clearer',

DependencyInjection/Configuration.php

@@ -902,8 +902,8 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                             ->defaultValue('%kernel.project_dir%/assets/vendor')
                         ->end()
                         ->scalarNode('provider')
-                            ->info('The provider (CDN) to use', class_exists(ImportMapManager::class) ? sprintf(' (e.g.: "%s").', implode('", "', ImportMapManager::PROVIDERS)) : '.')
-                            ->defaultValue('jspm')
+                            ->info('The provider (CDN) to use'.(class_exists(ImportMapManager::class) ? sprintf(' (e.g.: "%s").', implode('", "', ImportMapManager::PROVIDERS)) : '.'))
+                            ->defaultValue('jsdelivr.esm')
                         ->end()
                     ->end()
                 ->end()

DependencyInjection/FrameworkExtension.php

@@ -34,6 +34,7 @@
 use Symfony\Component\AssetMapper\AssetMapper;
 use Symfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolverInterface;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -1314,14 +1315,21 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
             ->getDefinition('asset_mapper.importmap.manager')
             ->replaceArgument(2, $config['importmap_path'])
             ->replaceArgument(3, $config['vendor_dir'])
-            ->replaceArgument(4, $config['provider'])
+        ;
+
+        $container
+            ->getDefinition('asset_mapper.importmap.resolver')
+            ->replaceArgument(0, $config['provider'])
         ;
 
         $container
             ->getDefinition('asset_mapper.importmap.renderer')
             ->replaceArgument(2, $config['importmap_polyfill'] ?? ImportMapManager::POLYFILL_URL)
             ->replaceArgument(3, $config['importmap_script_attributes'])
         ;
+
+        $container->registerForAutoconfiguration(PackageResolverInterface::class)
+            ->addTag('asset_mapper.importmap.resolver');
     }
 
     /**

Resources/config/asset_mapper.php

@@ -29,6 +29,9 @@
 use Symfony\Component\AssetMapper\Factory\MappedAssetFactory;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapRenderer;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\JsDelivrEsmResolver;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\JspmResolver;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolver;
 use Symfony\Component\AssetMapper\MapperAwareAssetPackage;
 use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolver;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -136,10 +139,40 @@
                 service('asset_mapper.public_assets_path_resolver'),
                 abstract_arg('importmap.php path'),
                 abstract_arg('vendor directory'),
-                abstract_arg('provider'),
+                service('asset_mapper.importmap.resolver'),
             ])
         ->alias(ImportMapManager::class, 'asset_mapper.importmap.manager')
 
+        ->set('asset_mapper.importmap.resolver', PackageResolver::class)
+            ->args([
+                abstract_arg('provider'),
+                tagged_locator('asset_mapper.importmap.resolver'),
+            ])
+
+        ->set('asset_mapper.importmap.resolver.jsdelivr_esm', JsDelivrEsmResolver::class)
+            ->args([service('http_client')])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSDELIVR_ESM])
+
+        ->set('asset_mapper.importmap.resolver.jspm', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_JSPM])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSPM])
+
+        ->set('asset_mapper.importmap.resolver.jspm_system', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_JSPM_SYSTEM])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSPM_SYSTEM])
+
+        ->set('asset_mapper.importmap.resolver.skypack', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_SKYPACK])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_SKYPACK])
+
+        ->set('asset_mapper.importmap.resolver.jsdelivr', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_JSDELIVR])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSDELIVR])
+
+        ->set('asset_mapper.importmap.resolver.unpkg', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_UNPKG])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_UNPKG])
+
         ->set('asset_mapper.importmap.renderer', ImportMapRenderer::class)
             ->args([
                 service('asset_mapper.importmap.manager'),

Tests/DependencyInjection/ConfigurationTest.php

@@ -112,7 +112,7 @@ public function testAssetMapperCanBeEnabled()
             'importmap_path' => '%kernel.project_dir%/importmap.php',
             'importmap_polyfill' => null,
             'vendor_dir' => '%kernel.project_dir%/assets/vendor',
-            'provider' => 'jspm',
+            'provider' => 'jsdelivr.esm',
             'importmap_script_attributes' => [],
         ];
 
@@ -624,7 +624,7 @@ protected static function getBundleDefaultConfig()
                 'importmap_path' => '%kernel.project_dir%/importmap.php',
                 'importmap_polyfill' => null,
                 'vendor_dir' => '%kernel.project_dir%/assets/vendor',
-                'provider' => 'jspm',
+                'provider' => 'jsdelivr.esm',
                 'importmap_script_attributes' => [],
             ],
             'cache' => [