symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php‎
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php‎
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎
Lines changed: 9 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php‎
Lines changed: 34 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php‎
Lines changed: 34 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php‎
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/AssetMapper/AssetMapper.php‎
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/AssetMapper/AssetMapper.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/AssetMapper/AssetMapperCompiler.php‎
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/AssetMapper/AssetMapperCompiler.php‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/AssetMapper/AssetMapperDevServerSubscriber.php‎
Lines changed: 6 additions & 6 deletions b/‎src/Symfony/Component/AssetMapper/AssetMapperDevServerSubscriber.php‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php‎
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/AssetMapper/Command/DebugAssetMapperCommand.php‎
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/AssetMapper/Command/DebugAssetMapperCommand.php‎
Lines changed: 2 additions & 2 deletions
@@ -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',
 
@@ -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()
 
@@ -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');
     }
 
     /**
 
@@ -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'),
 
@@ -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' => [
 
@@ -74,7 +74,7 @@ public function getPublicPath(string $logicalPath): ?string
 
         $asset = $this->getAsset($logicalPath);
 
-        return $asset?->getPublicPath();
+        return $asset?->publicPath;
     }
 
     private function loadManifest(): array
 
@@ -32,14 +32,14 @@ public function __construct(private readonly iterable $assetCompilers, private r
     {
     }
 
-    public function compile(string $content, MappedAsset $mappedAsset): string
+    public function compile(string $content, MappedAsset $asset): string
     {
         foreach ($this->assetCompilers as $compiler) {
-            if (!$compiler->supports($mappedAsset)) {
+            if (!$compiler->supports($asset)) {
                 continue;
             }
 
-            $content = $compiler->compile($content, $mappedAsset, $this->assetMapper ??= ($this->assetMapperFactory)());
+            $content = $compiler->compile($content, $asset, $this->assetMapper ??= ($this->assetMapperFactory)());
         }
 
         return $content;
 
@@ -128,15 +128,15 @@ public function onKernelRequest(RequestEvent $event): void
             throw new NotFoundHttpException(sprintf('Asset with public path "%s" not found.', $pathInfo));
         }
 
-        $mediaType = $this->getMediaType($asset->getPublicPath());
+        $mediaType = $this->getMediaType($asset->publicPath);
         $response = (new Response(
-            $asset->getContent(),
+            $asset->content,
             headers: $mediaType ? ['Content-Type' => $mediaType] : [],
         ))
             ->setPublic()
             ->setMaxAge(604800)
             ->setImmutable()
-            ->setEtag($asset->getDigest())
+            ->setEtag($asset->digest)
         ;
 
         $event->setResponse($response);
@@ -164,15 +164,15 @@ private function findAssetFromCache(string $pathInfo): ?MappedAsset
             $cachedAsset = $this->cacheMapCache->getItem(hash('xxh128', $pathInfo));
             $asset = $cachedAsset->isHit() ? $this->assetMapper->getAsset($cachedAsset->get()) : null;
 
-            if (null !== $asset && $asset->getPublicPath() === $pathInfo) {
+            if (null !== $asset && $asset->publicPath === $pathInfo) {
                 return $asset;
             }
         }
 
         // we did not find a match
         $asset = null;
         foreach ($this->assetMapper->allAssets() as $assetCandidate) {
-            if ($pathInfo === $assetCandidate->getPublicPath()) {
+            if ($pathInfo === $assetCandidate->publicPath) {
                 $asset = $assetCandidate;
                 break;
             }
@@ -183,7 +183,7 @@ private function findAssetFromCache(string $pathInfo): ?MappedAsset
         }
 
         if (null !== $cachedAsset) {
-            $cachedAsset->set($asset->getLogicalPath());
+            $cachedAsset->set($asset->logicalPath);
             $this->cacheMapCache->save($cachedAsset);
         }
 
 
@@ -122,14 +122,14 @@ private function createManifestAndWriteFiles(SymfonyStyle $io, string $publicDir
         $manifest = [];
         foreach ($allAssets as $asset) {
             // $asset->getPublicPath() will start with a "/"
-            $targetPath = $publicDir.$asset->getPublicPath();
+            $targetPath = $publicDir.$asset->publicPath;
 
             if (!is_dir($dir = \dirname($targetPath))) {
                 $this->filesystem->mkdir($dir);
             }
 
-            $this->filesystem->dumpFile($targetPath, $asset->getContent());
-            $manifest[$asset->getLogicalPath()] = $asset->getPublicPath();
+            $this->filesystem->dumpFile($targetPath, $asset->content);
+            $manifest[$asset->logicalPath] = $asset->publicPath;
         }
         ksort($manifest);
         $io->comment(sprintf('Compiled <info>%d</info> assets', \count($manifest)));
 
@@ -70,8 +70,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $rows = [];
         foreach ($allAssets as $asset) {
-            $logicalPath = $asset->getLogicalPath();
-            $sourcePath = $this->relativizePath($asset->getSourcePath());
+            $logicalPath = $asset->logicalPath;
+            $sourcePath = $this->relativizePath($asset->sourcePath);
 
             if (!$input->getOption('full')) {
                 $logicalPath = $this->shortenPath($logicalPath);